Changeset 21825

Timestamp:

09/12/2012 02:16:46 AM (12 years ago)

Author:

nacin

Message:

Don't show Appearance > Widgets if the theme has no sidebars defined. props SergeyBiryukov for the initial patch. fixes #21761.

Location:

trunk

Files:

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

trunk/wp-admin/widgets.php

@@ -69 +69 @@
 );
 
-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;
+if ( ! current_theme_supports( 'widgets' ) ) {
+    wp_die( __( '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>.' ) );
 }
 

trunk/wp-includes/functions.php

@@ -2550 +2550 @@
 function wp_widgets_add_menu() {
     global $submenu;
+
+    if ( ! current_theme_supports( 'widgets' ) )
+        return;
+
     $submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
     ksort( $submenu['themes.php'], SORT_NUMERIC );