Changeset 13743

Timestamp:

03/17/2010 09:34:24 PM (15 years ago)

Author:

nacin

Message:

Fix notice for when no menus are located. see #11817

File:

• trunk/wp-includes/nav-menu-template.php (modified) (15 diffs)

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

@@ -46 +46 @@
     }
 
-    if ( !is_wp_error($menu) && $menu)
+    if ( $menu && ! is_wp_error( $menu ) )
         $args->menu = $menu->term_id;
     $nav_menu = '';
@@ -52 +52 @@
     if ( 'div' == $args->container ) {
         $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : '';
-
+        
         if ( is_nav_menu($menu) ) {
             $nav_menu .= '<div id="menu-' . $menu->slug . '"'. $class .'>';
@@ -64 +64 @@
     if ( 'div' == $args->container )
         $nav_menu .= '</div>';
-
+    
     $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
@@ -86 +86 @@
     $defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend',
     'fallback_cb' => '', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
-
+    
     $args = wp_parse_args( $args, $defaults );
     $args = apply_filters( 'wp_get_nav_menu_args', $args );
     $args = (object) $args;
-
+    
     // Variable setup
     $nav_menu = '';
@@ -97 +97 @@
     $parent_stack = array();
     $parent_menu_order = array();
-
+    
     // Get the menu object
     $menu = wp_get_nav_menu_object( $args->menu );
-
+    
     // If the menu exists, get it's items.
     if ( $menu && !is_wp_error($menu) )
         $menu_items = wp_get_nav_menu_items( $menu->term_id, 'backend' );
-
+    
     // If no menu was found or if the menu has no items, call the fallback_cb
     if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) {
@@ -112 +112 @@
         }
     }
-
+    
     foreach ( $menu_items as $key => $menu_item ) {
         // Set up the $menu_item variables
@@ -120 +120 @@
         $maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"';
         $classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : '';
-
+        
         $items .= '<li id="menu-item-'. $menu_item->ID .'"'. $maybe_value . $classes .'>';
         $items .= wp_get_nav_menu_item( $menu_item, $args->context, $args );
-
+        
         // Indent children
         $last_item = ( count( $menu_items ) == $menu_item->menu_order );
@@ -142 +142 @@
         }
     }
-
+    
     // CSS class
     $ul_class = $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
     $nav_menu .= '<ul'. $ul_class .'>';
-
+    
     // Allow plugins to hook into the menu to add their own <li>'s
     if ( 'frontend' == $args->context ) {
@@ -155 +155 @@
         $nav_menu .= $items;
     }
-
+    
     $nav_menu .= '</ul>';
-
+    
     return apply_filters( 'wp_get_nav_menu', $nav_menu );
 }
@@ -180 +180 @@
             $attributes .= ( isset($menu_item->xfn) && '' != $menu_item->xfn ) ? ' rel="'. esc_attr($menu_item->xfn) .'"' : '';
             $attributes .= ( isset($menu_item->url) && '' != $menu_item->url ) ? ' href="'. esc_attr($menu_item->url) .'"' : '';
-
+            
             $output .= esc_html( $args->before_link );
             $output .= '<a'. $attributes .'>';
@@ -186 +186 @@
             $output .= '</a>';
             $output .= esc_html( $args->after_link );
-
-            break;
-
+            
+            break;
+        
         case 'backend':
             $output .= '<dl><dt>';
@@ -205 +205 @@
             }
             $output .= '<span class="item-type">'. esc_html($label) .'</span>';
-
+            
             // Actions
             $output .= '<a class="item-edit thickbox" id="edit'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
             $output .= '<a class="item-delete" id="delete'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'">'. __('Delete') .'</a>';
-
+            
             $output .= '</dt></dl>';
-
+            
             // Menu Item Settings
             $output .= '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->ID ) .'" />';
@@ -227 +227 @@
             $output .= '<input type="hidden" name="menu-item-target[]" id="menu-item-target'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->target ) .'" />';
             break;
-
+        
         case 'custom':
             $menu_id = 'menu-item-' . $menu_item->db_id;
             $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
-
+            
             // Menu item hidden fields
             $output .= '<input type="hidden" class="menu-item-db-id" value="'. esc_attr( $menu_item->db_id ) .'" />';
@@ -246 +246 @@
             $output .= '<input type="hidden" class="menu-item-xfn" value="'. esc_attr( $menu_item->xfn ) .'" />';
             break;
-
+        
         case 'taxonomy':
         case 'post_type':
             $menu_id = 'menu-item-' . $menu_item->db_id;
             $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
-
+            
             // Menu item hidden fields
             $output .= '<input type="hidden" class="menu-item-db-id" value="0" />';
@@ -263 +263 @@
             break;
     }
-
+    
     return $output;
 }