Ticket #26327: 26327.diff

src/wp-admin/includes/widgets.php

@@ -71 +71 @@
         $description = wp_sidebar_description( $sidebar );
 
         echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
-
         if ( $sidebar_name ) {
+                if( 'Inactive Widgets' != $sidebar_name ) {
                 ?>
                 <div class="sidebar-name">
                         <div class="sidebar-name-arrow"><br /></div>
                         <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
                 </div>
                 <?php
+                } else {
+                ?>
+                <div>
+                        <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
+                </div>
+                <?php
+                }
         }
 
         echo '<div class="sidebar-description">';

src/wp-admin/widgets.php

@@ -350 +350 @@
 $theme_sidebars = array();
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
         if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
-                $wrap_class = 'widgets-holder-wrap';
+                $wrap_class = ( $registered_sidebar['id'] == 'wp_inactive_widgets' ) ? '' : 'widgets-holder-wrap';
                 if ( !empty( $registered_sidebar['class'] ) )
                         $wrap_class .= ' ' . $registered_sidebar['class'];