Changeset 28124 for trunk/src/wp-includes/widgets.php

Timestamp:

04/14/2014 10:45:40 PM (11 years ago)

Author:

nacin

Message:

Customizer: Properly handle widget settings when activating a previewed theme.

props westonruter, ocean90, gcorne.
fixes #27767.

File:

• trunk/src/wp-includes/widgets.php (modified) (3 diffs)

trunk/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) {
+/**
+ * Look for "lost" widgets, this has to run at least on each theme change.
+ *
+ * @since 2.8.0
+ *
+ * @param mixed $theme_changed Whether the theme was changed as a boolean. A value
+ *                             of 'customize' defers updates for the customizer.
+ * @return array
+ */
+function retrieve_widgets( $theme_changed = false ) {
     global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
@@ -1413 +1421 @@
         // time() that sidebars were stored is in $old_sidebars_widgets['time']
         $_sidebars_widgets = $old_sidebars_widgets['data'];
-        remove_theme_mod( 'sidebars_widgets' );
+
+        if ( 'customize' === $theme_changed ) {
+            remove_theme_mod( 'sidebars_widgets' );
+        }
 
         foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
@@ -1496 +1507 @@
 
     $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
-    wp_set_sidebars_widgets($sidebars_widgets);
+    if ( 'customize' === $theme_changed ) {
+        wp_set_sidebars_widgets( $sidebars_widgets );
+    }
 
     return $sidebars_widgets;