Changeset 19455

Timestamp:

11/26/2011 06:16:43 AM (13 years ago)

Author:

azaozz

Message:

Check the sidebar class for orphaned sidebars, match sidebars by id while retrieving orphans and the theme has not changed, props SergeyBiryukov, fixes #19350

Location:

trunk

Files:

• wp-admin/widgets.php (modified) (3 diffs)
• wp-includes/widgets.php (modified) (3 diffs)

trunk/wp-admin/widgets.php

@@ -97 +97 @@
             register_sidebar(array(
                 'name' => __( 'Inactive Sidebar (not used)' ),
-                'id' => 'orphaned_widgets-' . $sidebar_id,
+                'id' => $sidebar_id,
                 'class' => 'inactive-sidebar orphan-sidebar',
                 'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
@@ -345 +345 @@
 <?php
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-    if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+    if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
         $wrap_class = 'widgets-holder-wrap';
         if ( !empty( $registered_sidebar['class'] ) )
@@ -377 +377 @@
 $i = 0;
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-    if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
+    if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
         continue;
 

trunk/wp-includes/widgets.php

@@ -1158 +1158 @@
         $sidebars_widgets = wp_get_sidebars_widgets();
 
-    retrieve_widgets();
+    retrieve_widgets(true);
 }
 
 // look for "lost" widgets, this has to run at least on each theme change
-function retrieve_widgets() {
+function retrieve_widgets($theme_changed = false) {
     global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
     $registered_sidebar_keys = array_keys( $wp_registered_sidebars );
+    $orphaned = 0;
 
     $old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
@@ -1172 +1173 @@
         $_sidebars_widgets = $old_sidebars_widgets['data'];
         remove_theme_mod( 'sidebars_widgets' );
- 
-        $orphaned = 0;
 
         foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
@@ -1203 +1202 @@
         unset( $sidebars_widgets['wp_inactive_widgets'] );
 
-        foreach ( $wp_registered_sidebars as $id => $settings )
-            $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
-
-        $orphaned = 0;
+        foreach ( $wp_registered_sidebars as $id => $settings ) {
+            if ( $theme_changed ) {
+                $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+            } else {
+                // no theme change, grab only sidebars that are currently registered
+                if ( isset( $sidebars_widgets[$id] ) ) {
+                    $_sidebars_widgets[$id] = $sidebars_widgets[$id];
+                    unset( $sidebars_widgets[$id] );
+                }
+            }
+        }
 
         foreach ( $sidebars_widgets as $val ) {