Changeset 14560

Timestamp:

05/11/2010 03:55:17 PM (15 years ago)

Author:

ryan

Message:

Don't prime menu item cache if a persistent cache is being used. Prime the menu item cache only on the first call to wp_get_nav_menu_items(). Avoids unneeded queries when wp_get_nav_menu_items() is called repeatedly. see #12734

File:

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

trunk/wp-includes/nav-menu.php

@@ -406 +406 @@
  */
 function wp_get_nav_menu_items( $menu, $args = array() ) {
+    global $_wp_using_ext_object_cache;
+
     $menu = wp_get_nav_menu_object( $menu );
 
     if ( ! $menu )
         return false;
+
+    static $fetched = array();
 
     $items = get_objects_in_term( $menu->term_id, 'nav_menu' );
@@ -430 +434 @@
 
     // Get all posts and terms at once to prime the caches
-    $posts = array();
-    $terms = array();
-    foreach ( $items as $item ) {
-        $object_id = get_post_meta( $item->ID, '_menu_item_object_id', true );
-        $object = get_post_meta( $item->ID, '_menu_item_object', true );
-        $type = get_post_meta( $item->ID, '_menu_item_type', true );
-
-        if ( 'post_type' == $type )
-            $posts[$object][] = $object_id;
-        elseif ( 'taxonomy' == $type)
-            $terms[$object][] = $object_id;
-    }
-
-    if ( !empty($posts) ) {
-        foreach ( array_keys($posts) as $post_type ) {
-            get_posts( array('post__in' => $posts[$post_type], 'post_type' => $post_type, 'nopaging' => true, 'update_post_term_cache' => false) );
-        }
-    }
-    unset($posts);
-
-    if ( !empty($terms) ) {
-        foreach ( array_keys($terms) as $taxonomy ) {
-            get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
-        }
-    }
-    unset($terms);
+    if ( empty($fetched[$menu->term_id]) || $_wp_using_ext_object_cache ) {
+        $fetched[$menu->term_id] = true;
+        $posts = array();
+        $terms = array();
+        foreach ( $items as $item ) {
+            $object_id = get_post_meta( $item->ID, '_menu_item_object_id', true );
+            $object = get_post_meta( $item->ID, '_menu_item_object', true );
+            $type = get_post_meta( $item->ID, '_menu_item_type', true );
+    
+            if ( 'post_type' == $type )
+                $posts[$object][] = $object_id;
+            elseif ( 'taxonomy' == $type)
+                $terms[$object][] = $object_id;
+        }
+    
+        if ( !empty($posts) ) {
+            foreach ( array_keys($posts) as $post_type ) {
+                get_posts( array('post__in' => $posts[$post_type], 'post_type' => $post_type, 'nopaging' => true, 'update_post_term_cache' => false) );
+            }
+        }
+        unset($posts);
+    
+        if ( !empty($terms) ) {
+            foreach ( array_keys($terms) as $taxonomy ) {
+                get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
+            }
+        }
+        unset($terms);
+    }
 
     $items = array_map( 'wp_setup_nav_menu_item', $items );