Adding upstream version 6.6.1+dfsg1.upstream/6.6.1+dfsg1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/wp-includes/js/dist/preferences-persistence.js b/wp-includes/js/dist/preferences-persistence.js
index 80ebebe..9016a07 100644
--- a/wp-includes/js/dist/preferences-persistence.js
+++ b/wp-includes/js/dist/preferences-persistence.js
@@ -750,14 +750,14 @@ function convertLegacyData(data) {
   data = moveIndividualPreferenceToPreferences(data, {
     from: 'core/edit-post',
     to: 'core/edit-post'
-  }, 'preferredStyleVariations');
-  data = moveIndividualPreferenceToPreferences(data, {
-    from: 'core/edit-post',
-    to: 'core/edit-post'
   }, 'panels', convertEditPostPanels);
   data = moveIndividualPreferenceToPreferences(data, {
     from: 'core/editor',
-    to: 'core/edit-post'
+    to: 'core'
+  }, 'isPublishSidebarEnabled');
+  data = moveIndividualPreferenceToPreferences(data, {
+    from: 'core/edit-post',
+    to: 'core'
   }, 'isPublishSidebarEnabled');
   data = moveIndividualPreferenceToPreferences(data, {
     from: 'core/edit-site',
@@ -810,7 +810,7 @@ function convertComplementaryAreas(state) {
 function convertEditorSettings(data) {
   var _newData$coreEditPo, _newData$coreEditSi;
   let newData = data;
-  const settingsToMoveToCore = ['allowRightClickOverrides', 'distractionFree', 'editorMode', 'fixedToolbar', 'focusMode', 'hiddenBlockTypes', 'inactivePanels', 'keepCaretInsideBlock', 'mostUsedBlocks', 'openPanels', 'showBlockBreadcrumbs', 'showIconLabels', 'showListViewByDefault'];
+  const settingsToMoveToCore = ['allowRightClickOverrides', 'distractionFree', 'editorMode', 'fixedToolbar', 'focusMode', 'hiddenBlockTypes', 'inactivePanels', 'keepCaretInsideBlock', 'mostUsedBlocks', 'openPanels', 'showBlockBreadcrumbs', 'showIconLabels', 'showListViewByDefault', 'isPublishSidebarEnabled', 'isComplementaryAreaVisible', 'pinnedItems'];
   settingsToMoveToCore.forEach(setting => {
     if (data?.['core/edit-post']?.[setting] !== undefined) {
       newData = {