sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't call wp_get_nav_menu_items() twice. 

git-svn-id: https://develop.svn.wordpress.org/trunk@14529 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2010-05-10 01:11:04 +00:00
parent ee0b76261b
commit 581779a30d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/nav-menu-template.php
View File

@ -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