Changeset 19332 for trunk/wp-includes/widgets.php

Timestamp:

11/18/2011 06:00:29 AM (15 years ago)

Author:

azaozz

Message:

When restoring sidebars after switching back to an old theme, make sure the saved data matches the theme's current sidebars, fixes #19092

File:

• trunk/wp-includes/widgets.php (modified) (1 diff)

trunk/wp-includes/widgets.php

@@ -1165 +1165 @@
         global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
+        $_sidebars_widgets = array();
+        $sidebars = array_keys($wp_registered_sidebars);
         $old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
         if ( is_array( $old_sidebars_widgets ) ) {
                 // time() that sidebars were stored is in $old_sidebars_widgets['time']
-                $_sidebars_widgets = $old_sidebars_widgets['data'];
+                $old_sidebars = $old_sidebars_widgets['data'];
+
+                // make sure the saved sidebars match
+                foreach ( $sidebars as $sidebar_id ) {
+                        $_sidebars_widgets[$sidebar_id] = isset($old_sidebars[$sidebar_id]) ? $old_sidebars[$sidebar_id] : array();
+                }
+
                 remove_theme_mod( 'sidebars_widgets' );
         } else {
                 if ( empty( $sidebars_widgets ) )
                         return;
-
-                $sidebars = array_keys($wp_registered_sidebars);
 
                 unset( $sidebars_widgets['array_version'] );