From 65423c7d164ba91d349ed49294a6864b054436ef Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 17 Mar 2010 21:34:24 +0000 Subject: [PATCH] Fix notice for when no menus are located. see #11817 git-svn-id: http://svn.automattic.com/wordpress/trunk@13743 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 8af7a1e62b..fbb59ffa5a 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -45,13 +45,13 @@ function wp_nav_menu( $args = array() ) { } } - if ( !is_wp_error($menu) && $menu) + if ( $menu && ! is_wp_error( $menu ) ) $args->menu = $menu->term_id; $nav_menu = ''; if ( 'div' == $args->container ) { $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : ''; - + if ( is_nav_menu($menu) ) { $nav_menu .= ''; - + $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args ); if ( $args->echo ) @@ -85,25 +85,25 @@ function wp_nav_menu( $args = array() ) { function wp_get_nav_menu( $args = array() ) { $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 = ''; $items = ''; $current_parent = 0; $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) ) ) { if ( function_exists($args->fallback_cb) ) { @@ -111,7 +111,7 @@ function wp_get_nav_menu( $args = array() ) { return call_user_func( $args->fallback_cb, $_args ); } } - + foreach ( $menu_items as $key => $menu_item ) { // Set up the $menu_item variables $menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' ); @@ -119,10 +119,10 @@ function wp_get_nav_menu( $args = array() ) { $type = $menu_item->append; $maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"'; $classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : ''; - + $items .= ''; } } - + // CSS class $ul_class = $args->menu_class ? ' class="'. $args->menu_class .'"' : ''; $nav_menu .= ''; - + // Allow plugins to hook into the menu to add their own
  • 's if ( 'frontend' == $args->context ) { $items = apply_filters( 'wp_nav_menu_items', $items, $args ); @@ -154,9 +154,9 @@ function wp_get_nav_menu( $args = array() ) { } else { $nav_menu .= $items; } - + $nav_menu .= ''; - + return apply_filters( 'wp_get_nav_menu', $nav_menu ); } @@ -179,15 +179,15 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array( $attributes .= ( isset($menu_item->classes) && '' != $menu_item->classes ) ? ' class="'. esc_attr($menu_item->classes) .'"' : ''; $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 .= ''; $output .= esc_html( $args->before_title . $menu_item->title . $args->after_title ); $output .= ''; $output .= esc_html( $args->after_link ); - + break; - + case 'backend': $output .= '
    '; $output .= ''. esc_html($menu_item->title) .''; @@ -204,13 +204,13 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array( $label = $menu_item->append; } $output .= ''. esc_html($label) .''; - + // Actions $output .= ''. __('Edit') .' | '; $output .= ''. __('Delete') .''; - + $output .= '
    '; - + // Menu Item Settings $output .= ''; $output .= ''; @@ -226,11 +226,11 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array( $output .= ''; $output .= ''; break; - + case 'custom': $menu_id = 'menu-item-' . $menu_item->db_id; $output .= ''; - + // Menu item hidden fields $output .= ''; $output .= ''; @@ -245,12 +245,12 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array( $output .= ''; $output .= ''; break; - + case 'taxonomy': case 'post_type': $menu_id = 'menu-item-' . $menu_item->db_id; $output .= ''; - + // Menu item hidden fields $output .= ''; $output .= ''; @@ -262,7 +262,7 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array( $output .= ''; break; } - + return $output; } ?> \ No newline at end of file