Ticket #19350: 19350.patch

wp-admin/widgets.php

@@ -94 +94 @@
 
         if ( !isset( $wp_registered_sidebars[ $sidebar_id ] ) ) {
                 if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
-                        register_sidebar(array(
-                                'name' => __( 'Inactive Sidebar (from previous theme)' ),
+                        register_sidebar( array(
+                                'name' => __( 'Inactive Sidebar (not used)' ),
                                 'id' => $sidebar_id,
                                 'class' => 'inactive-sidebar orphan-sidebar',
-                                'description' => __( 'This is a left over sidebar from an old theme and does not show anywhere on your site' ),
+                                '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.' ),
                                 'before_widget' => '',
                                 'after_widget' => '',
                                 'before_title' => '',
                                 'after_title' => '',
-                        ));
+                        ) );
                 } else {
                         unset( $sidebars_widgets[ $sidebar_id ] );
                 }
@@ -344 +344 @@
 
 <?php
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-        if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+        if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) || false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) ) {
                 $wrap_class = 'widgets-holder-wrap';
                 if ( !empty( $registered_sidebar['class'] ) )
                         $wrap_class .= ' ' . $registered_sidebar['class'];
@@ -376 +376 @@
 <?php
 $i = 0;
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-        if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
+        if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) || false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) )
                 continue;
 
         $wrap_class = 'widgets-holder-wrap';