Ticket #19274: 19274-alternate.diff

wp-includes/widgets.php

@@ -1190 +1190 @@
 
                 unset( $sidebars_widgets['wp_inactive_widgets'] );
 
-                foreach ( $wp_registered_sidebars as $id => $settings )
-                        $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+                foreach ( $wp_registered_sidebars as $id => $settings ) {
+                        if ( isset( $sidebars_widgets[$id] ) ) {
+                                $_sidebars_widgets[$id] = $sidebars_widgets[$id];
+                                unset( $sidebars_widgets[$id] );
+                        }
+                }               
 
                 $orphaned = 0;