From 581779a30d2ad2d60c35583af7c6aac5aa2a007f Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 10 May 2010 01:11:04 +0000 Subject: [PATCH] Don't call wp_get_nav_menu_items() twice. git-svn-id: https://develop.svn.wordpress.org/trunk@14529 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/nav-menu-template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 988bca79e3..fb27d8ed1d 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -206,7 +206,7 @@ function wp_nav_menu( $args = array() ) { if ( ! $menu ) { $menus = wp_get_nav_menus(); foreach ( $menus as $menu_maybe ) { - if ( wp_get_nav_menu_items($menu_maybe->term_id) ) { + if ( $menu_items = wp_get_nav_menu_items($menu_maybe->term_id) ) { $menu = $menu_maybe; break; } @@ -214,7 +214,7 @@ function wp_nav_menu( $args = array() ) { } // If the menu exists, get its items. - if ( $menu && ! is_wp_error($menu) ) + if ( $menu && ! is_wp_error($menu) && !isset($menu_items) ) $menu_items = wp_get_nav_menu_items( $menu->term_id ); // If no menu was found or if the menu has no items, call the fallback_cb