Ticket #9695: 9695-retrieve_widgets.diff

wp-admin/widgets.php

@@ -40 +40 @@
 
 // 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
         foreach ( $sidebars as $id ) {
                 if ( array_key_exists( $id, $sidebars_widgets ) ) {
@@ -59 +59 @@
                 }
         }
 
-        // 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) ) {
                 foreach ( $sidebars_widgets as $lost => $val ) {
@@ -70 +66 @@
                                 $_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val );
                 }
         }
+        
+        // discard invalid, theme-specific widgets from sidebars
+        foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
+                $_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
         $shown_widgets = array();
@@ -105 +111 @@
         }
 
         $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);
 }
 retrieve_widgets();