Changeset 14529

Timestamp:

05/10/2010 01:11:04 AM (15 years ago)

Author:

ryan

Message:

Don't call wp_get_nav_menu_items() twice.

File:

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

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

@@ -207 +207 @@
         $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;
@@ -215 +215 @@
 
     // 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 );