Ticket #18598: 18598-2.diff

wp-includes/widgets.php

@@ -998 +998 @@
         if ( $deprecated !== true )
                 _deprecated_argument( __FUNCTION__, '2.8.1' );
 
-        global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
+        global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets, $sidebars_widgets;
 
         // If loading from front page, consult $_wp_sidebars_widgets rather than options
         // to see if wp_convert_widget_settings() has made manipulations in memory.
@@ -1219 +1219 @@
                 $_sidebars_widgets = $old_sidebars_widgets['data'];
                 remove_theme_mod( 'sidebars_widgets' );
         } else {
-                if ( ! is_array( $sidebars_widgets ) )
-                        $sidebars_widgets = wp_get_sidebars_widgets();
-
                 $sidebars = array_keys($wp_registered_sidebars);
 
                 unset( $sidebars_widgets['array_version'] );
@@ -1234 +1231 @@
                         return;
 
                 $_sidebars_widgets = array(
-                        'wp_inactive_widgets' => $sidebars_widgets['wp_inactive_widgets']
+                        'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
                 );
 
                 unset( $sidebars_widgets['wp_inactive_widgets'] );