Changeset 11161

Timestamp:

05/03/2009 07:53:54 AM (17 years ago)

Author:

azaozz

Message:

Do not import sidebars by index after switching themes, props Denis-de-Bernardy, see #9695

File:

• trunk/wp-admin/widgets.php (modified) (4 diffs)

trunk/wp-admin/widgets.php

@@ -41 +41 @@
 // look for "lost" widgets, this has to run at least on each theme change
 function retrieve_widgets() {
-        global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets;
+        global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
         $_sidebars_widgets = array();
         $sidebars = array_keys($wp_registered_sidebars);
+
+        unset( $sidebars_widgets['array_version'] );
 
         $diff = array_diff( array_keys($sidebars_widgets), $sidebars );
         if ( empty($diff) )
                 return;
-
-        unset( $sidebars_widgets['array_version'] );
 
         // Move the known-good ones first
@@ -60 +60 @@
         }
 
-        // Assign to each unmatched registered sidebar the first available orphan
-        while ( ( $sidebar = array_shift( $sidebars ) ) && $widgets = array_shift( $sidebars_widgets ) )
-                $_sidebars_widgets[ $sidebar ] = $widgets;
-
         // if new theme has less sidebars than the old theme
         if ( !empty($sidebars_widgets) ) {
@@ -71 +67 @@
                 }
         }
+        
+        // discard invalid, theme-specific widgets from sidebars
+        foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
+                if ( !is_array($widgets) )
+                        continue;
+                
+                $_widgets = array();
+                foreach ( $widgets as $widget ) {
+                        if ( isset($wp_registered_widgets[$widget]) )
+                                $_widgets[] = $widget;
+                }
+                $_sidebars_widgets[$sidebar] = $_widgets;
+        }
 
         $sidebars_widgets = $_sidebars_widgets;
-        unset($_sidebars_widgets);
+        unset($_sidebars_widgets, $_widgets);
 
         // find hidden/lost multi-widget instances
@@ -106 +115 @@
 
         $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
-        $sidebars_widgets['array_version'] = 3;
         wp_set_sidebars_widgets($sidebars_widgets);
 }