Ticket #27767: 27767-02.patch

src/wp-includes/class-wp-customize-manager.php

@@ -575 +575 @@
                         // to operate properly.
                         $this->stop_previewing_theme();
                         switch_theme( $this->get_stylesheet() );
+                        update_option( 'theme_switched_via_customizer', true );
                         $this->start_previewing_theme();
                 }
 

src/wp-includes/class-wp-customize-widgets.php

@@ -315 +315 @@
                 }
         }
 
+        public function get_sidebars_widgets() {
+                global $sidebars_widgets;
+
+                $sidebars_widgets = get_option( 'sidebars_widgets' );
+                if ( ! $this->manager->is_theme_active() &&
+                        ( ( is_admin() && ! defined( 'DOING_AJAX' ) ) ||
+                        // Only override with widgets from theme_mods when loading the initial iframe
+                        ( isset( $_POST['customize_messenger_channel'] ) && $_POST['customize_messenger_channel'] === 'preview-0' ) ) ) {
+
+                        $sidebars_widgets = retrieve_widgets( true, false );
+                }
+
+                unset( $sidebars_widgets['array_version'] );
+
+                return $sidebars_widgets;
+        }
+
         /**
          * Register customizer settings and controls for all sidebars and widgets.
          *
@@ -327 +344 @@
                 $sidebars_widgets = array_merge(
                         array( 'wp_inactive_widgets' => array() ),
                         array_fill_keys( array_keys( $GLOBALS['wp_registered_sidebars'] ), array() ),
-                        wp_get_sidebars_widgets()
+                        $this->get_sidebars_widgets()
                 );
 
                 $new_setting_ids = array();
@@ -891 +908 @@
          * @param array $sidebars_widgets List of widgets for the current sidebar.
          */
         public function preview_sidebars_widgets( $sidebars_widgets ) {
-                $sidebars_widgets = get_option( 'sidebars_widgets' );
+                $sidebars_widgets = $this->get_sidebars_widgets();
 
-                unset( $sidebars_widgets['array_version'] );
                 return $sidebars_widgets;
         }
 

src/wp-includes/theme.php

@@ -1791 +1791 @@
         if ( $stylesheet = get_option( 'theme_switched' ) ) {
                 $old_theme = wp_get_theme( $stylesheet );
 
+                if ( get_option( 'theme_switched_via_customizer' ) ) {
+                        remove_filter( 'after_switch_theme', '_wp_sidebars_changed' );
+                        update_option( 'theme_switched_via_customizer', false );
+                }
+
                 if ( $old_theme->exists() ) {
                         /**
                          * Fires on the first WP load after a theme switch if the old theme still exists.
@@ -1918 +1923 @@
                 }());
         </script>
         <?php
-}
- No newline at end of file
+}

src/wp-includes/widgets.php

@@ -1402 +1402 @@
 }
 
 // look for "lost" widgets, this has to run at least on each theme change
-function retrieve_widgets($theme_changed = false) {
+function retrieve_widgets($theme_changed = false, $update = true ) {
         global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
         $registered_sidebar_keys = array_keys( $wp_registered_sidebars );
@@ -1412 +1412 @@
         if ( is_array( $old_sidebars_widgets ) ) {
                 // time() that sidebars were stored is in $old_sidebars_widgets['time']
                 $_sidebars_widgets = $old_sidebars_widgets['data'];
-                remove_theme_mod( 'sidebars_widgets' );
+
+                if ( $update ) {
+                        remove_theme_mod( 'sidebars_widgets' );
+                }
 
                 foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
                         if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
@@ -1495 +1498 @@
         }
 
         $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
-        wp_set_sidebars_widgets($sidebars_widgets);
+        if ( $update ) {
+                wp_set_sidebars_widgets($sidebars_widgets);
+        }
 
         return $sidebars_widgets;
 }