Changeset 15191

Timestamp:

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

Author:

nacin

Message:

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

Location:

trunk/wp-admin

Files:

• includes/nav-menu.php (modified) (2 diffs)
• nav-menus.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();

trunk/wp-admin/nav-menus.php

@@ -249 +249 @@
                 // Remove this menu from any locations.
                 $locations = get_theme_mod( 'nav_menu_locations' );
-                foreach ( $locations as $location => $menu_id ) {
+                foreach ( (array) $locations as $location => $menu_id ) {
                     if ( $menu_id == $nav_menu_selected_id )
                         $locations[ $location ] = 0;
@@ -431 +431 @@
 }
 
-// The theme supports menus
-if ( current_theme_supports('nav-menus') ) {
-    // Set up nav menu
-    wp_nav_menu_setup();
-
-// The theme does not support menus but supports widgets
-} elseif ( current_theme_supports('widgets') ) {
-    // Set up nav menu
-    wp_nav_menu_setup();
-    $messages[] = '<div id="message" class="error"><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>';
-}
-
+wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
+
+if ( ! get_registered_nav_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>';
 
 $help =  '<p>' . __('This feature is new in version 3.0; to use a custom menu in place of your theme&#8217;s default menus, support for this feature must be registered in the theme&#8217;s functions.php file. If your theme does not support the custom menus feature yet (the new default theme, Twenty Ten, does), you can learn about adding support yourself by following the below link.') . '</p>';