Changeset 19334

Timestamp:

11/18/2011 07:00:26 AM (15 years ago)

Author:

azaozz

Message:

Prevent errors in assigning widgets to sidebars for themes with dynamic sidebars, props batmoo, fixes #19274

File:

• trunk/wp-admin/widgets.php (modified) (1 diff)

trunk/wp-admin/widgets.php

@@ -63 +63 @@
                 continue;
 
-        if ( empty( $wp_registered_sidebars[ $sidebar_id ] ) && ! empty( $widgets ) ) {
-                // register the inactive_widgets area as sidebar
-                register_sidebar(array(
-                        'name' => __( 'Inactive Sidebar (from previous theme)' ),
-                        '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' ),
-                        'before_widget' => '',
-                        'after_widget' => '',
-                        'before_title' => '',
-                        'after_title' => '',
-                ));
+        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)' ),
+                                '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' ),
+                                'before_widget' => '',
+                                'after_widget' => '',
+                                'before_title' => '',
+                                'after_title' => '',
+                        ));
+                } else {
+                        unset( $sidebars_widgets[ $sidebar_id ] );
+                }
         }
 }