Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 07:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Don't call wp_get_nav_menu_items() twice.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-05-10 01:11:04 +00:00
parent 66502fba1a
commit 0c99110a58
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