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

Timestamp:

11/24/2011 05:44:53 PM (15 years ago)

Author:

azaozz

Message:

Move the check whether the theme supports widgets before we register any extra sidebars, fixes #19352

File:

• trunk/wp-admin/widgets.php (modified) (2 diffs)

trunk/wp-admin/widgets.php

@@ -64 +64 @@
 );
 
+if ( empty($wp_registered_sidebars) ) {
+        // the theme has no sidebars, die.
+        require_once( './admin-header.php' );
+?>
+
+        <div class="wrap">
+        <?php screen_icon(); ?>
+        <h2><?php echo esc_html( $title ); ?></h2>
+                <div class="error">
+                        <p><?php _e( 'No Sidebars Defined' ); ?></p>
+                </div>
+                <p><?php _e( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ); ?></p>
+        </div>
+
+<?php
+        require_once( './admin-footer.php' );
+        exit;
+}
+
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
@@ -105 +124 @@
 
 retrieve_widgets();
-
-if ( count($wp_registered_sidebars) == 1 ) {
-        // If only "wp_inactive_widgets" is defined the theme has no sidebars, die.
-        require_once( './admin-header.php' );
-?>
-
-        <div class="wrap">
-        <?php screen_icon(); ?>
-        <h2><?php echo esc_html( $title ); ?></h2>
-                <div class="error">
-                        <p><?php _e( 'No Sidebars Defined' ); ?></p>
-                </div>
-                <p><?php _e( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ); ?></p>
-        </div>
-
-<?php
-        require_once( './admin-footer.php' );
-        exit;
-}
 
 // We're saving a widget without js