Changeset 15193

Timestamp:

06/10/2010 05:57:30 PM (15 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.

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (3 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-content/themes/twentyten/functions.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (1 diff)

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();

trunk/wp-admin/menu.php

@@ -158 +158 @@
     $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
         $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
-        if ( current_theme_supports( 'nav-menus' ) || current_theme_supports( 'widgets' ) )
+        if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
             $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
 } else {
     $menu[60] = array( __('Appearance'), 'edit_theme_options', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
         $submenu['themes.php'][5]  = array(__('Themes'), 'edit_theme_options', 'themes.php');
-        if ( current_theme_supports( 'nav-menus' ) || current_theme_supports( 'widgets' ) )
+        if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
             $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' );
 }

trunk/wp-admin/nav-menus.php

@@ -16 +16 @@
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
 
-if ( ! current_theme_supports( 'nav-menus' ) && ! current_theme_supports( 'widgets' ) )
+if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
     wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
 
@@ -434 +434 @@
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! get_registered_nav_menus() && ! wp_get_nav_menus() )
+if ( ! current_theme_supports( 'menus' ) && ! wp_get_nav_menus() )
     echo '<div id="message" class="updated"><p>' . __('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></div>';
 

trunk/wp-content/themes/twentyten/functions.php

@@ -62 +62 @@
  * functions.php file.
  *
- * @uses add_theme_support() To add support for post thumbnails, navigation menus, and automatic feed links.
+ * @uses add_theme_support() To add support for post thumbnails and automatic feed links.
+ * @uses register_nav_menus() To add support for navigation menus.
  * @uses add_custom_background() To add support for a custom background.
  * @uses add_editor_style() To style the visual editor.

trunk/wp-includes/nav-menu.php

@@ -74 +74 @@
     global $_wp_registered_nav_menus;
 
-    add_theme_support( 'nav-menus' );
+    add_theme_support( 'menus' );
 
     $_wp_registered_nav_menus = array_merge( (array) $_wp_registered_nav_menus, $locations );