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

Timestamp:

06/10/2010 05:57:30 PM (14 years ago)

Author:

nacin

Message:

Switch to current_theme_supports(menus) internally. Adding theme support for 'nav-menus' is deprecated in favor of register_nav_menu(s). fixes #13825.

File:

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

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

@@ -366 +366 @@
 function wp_nav_menu_setup() {
     // Register meta boxes
-    if ( ( current_theme_supports( 'widgets' ) || get_registered_nav_menus() ) && wp_get_nav_menus() )
+    if ( 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' );
@@ -461 +461 @@
 function wp_nav_menu_locations_meta_box() {
     global $nav_menu_selected_id;
-    $locations = get_registered_nav_menus();
-
-    if ( empty( $locations ) ) {
+
+    if ( ! current_theme_supports( 'menus' ) ) {
         // 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>';
@@ -469 +468 @@
     }
 
+    $locations = get_registered_nav_menus();
     $menus = wp_get_nav_menus();
     $menu_locations = get_nav_menu_locations();