Ticket #10300: 10300.3.diff

wp-includes/widgets.php

@@ -967 +967 @@
                 if ( empty($_wp_sidebars_widgets) )
                         $sidebars_widgets = get_option('sidebars_widgets', array());
                 else
-                        $sidebars_widgets = &$_wp_sidebars_widgets;
+                        return apply_filters('sidebars_widgets', $_wp_sidebars_widgets);
         }
         $_sidebars_widgets = array();
 
@@ -1024 +1024 @@
                                         }
                                 }
 
-                                // Assign to each unmatched registered sidebar the first available orphan
-                                unset( $sidebars_widgets[ 'array_version' ] );
-                                while ( ( $sidebar = array_shift( $sidebars ) ) && $widgets = array_shift( $sidebars_widgets ) )
-                                        $_sidebars_widgets[ $sidebar ] = $widgets;
+                                // move the rest to wp_inactive_widgets
+                                if ( !isset($_sidebars_widgets['wp_inactive_widgets']) )
+                                        $_sidebars_widgets['wp_inactive_widgets'] = array();
+                                
+                                if ( !empty($sidebars_widgets) ) {
+                                        foreach ( $sidebars_widgets as $lost => $val ) {
+                                                if ( is_array($val) )
+                                                        $_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val );
+                                        }
+                                }
 
-                                $_sidebars_widgets['array_version'] = 3;
                                 $sidebars_widgets = $_sidebars_widgets;
                                 unset($_sidebars_widgets);
                         }
+                        
+                        $sidebars_widgets['array_version'] = 3;
 
                         if ( $update && is_admin() )
                                 update_option('sidebars_widgets', $sidebars_widgets);
@@ -1041 +1048 @@
         if ( isset($sidebars_widgets['array_version']) )
                 unset($sidebars_widgets['array_version']);
 
+        if ( !is_admin() )
+                $_wp_sidebars_widgets = $sidebars_widgets;
+
         $sidebars_widgets = apply_filters('sidebars_widgets', $sidebars_widgets);
         return $sidebars_widgets;
 }
@@ -1087 +1097 @@
  */
 function wp_convert_widget_settings($base_name, $option_name, $settings) {
         global $_wp_sidebars_widgets;
+        
         // This test may need expanding.
-        $single = false;
+        $single = $changed = false;
         if ( empty($settings) ) {
                 $single = true;
         } else {
@@ -1109 +1120 @@
                 if ( is_admin() ) {
                         $sidebars_widgets = get_option('sidebars_widgets');
                 } else {
-                        if ( empty($GLOBALS['_wp_sidebars_widgets']) )
-                                $GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets');
-                        $sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
+                        if ( empty($_wp_sidebars_widgets) )
+                                wp_get_sidebars_widgets(false);
+                        $sidebars_widgets = &$_wp_sidebars_widgets;
                 }
 
                 foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
@@ -1119 +1130 @@
                                 foreach ( $sidebar as $i => $name ) {
                                         if ( $base_name == $name ) {
                                                 $sidebars_widgets[$index][$i] = "$name-2";
+                                                $changed = true;
                                                 break 2;
                                         }
                                 }
                         }
                 }
 
-                if ( is_admin() )
+                if ( is_admin() && $changed )
                         update_option('sidebars_widgets', $sidebars_widgets);
         }