Changeset 19455 for trunk/wp-admin/widgets.php

Timestamp:

11/26/2011 06:16:43 AM (12 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

File:

• trunk/wp-admin/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;