Changeset 15191 for trunk/wp-admin/includes/nav-menu.php

Timestamp:

06/10/2010 05:37:15 PM (15 years ago)

Author:

nacin

Message:

Don't show an error when the theme supports widgets but not menus. see #13825.

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (2 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -366 +366 @@
 function wp_nav_menu_setup() {
     // Register meta boxes
-    if ( get_registered_nav_menus() && wp_get_nav_menus() )
+    if ( ( current_theme_supports( 'widgets' ) || get_registered_nav_menus() ) && wp_get_nav_menus() )
         add_meta_box( 'nav-menu-theme-locations', __( 'Theme Locations' ), 'wp_nav_menu_locations_meta_box' , 'nav-menus', 'side', 'default' );
     add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
@@ -462 +462 @@
     global $nav_menu_selected_id;
     $locations = get_registered_nav_menus();
+
+    if ( empty( $locations ) ) {
+        // We must only support widgets. Leave a message and bail.
+        echo '<p class="howto">' . __('The current theme does not natively support menus, but you can use the &#8220;Custom Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p>';
+        return;
+    }
+
     $menus = wp_get_nav_menus();
     $menu_locations = get_nav_menu_locations();