From 02058305b5c49d39295d71f62cf4eea40b582b97 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 11 May 2010 15:55:17 +0000
Subject: [PATCH] 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

git-svn-id: http://svn.automattic.com/wordpress/trunk@14560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/nav-menu.php | 53 +++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index f0a390902..9725f7889 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -405,11 +405,15 @@ function _sort_nav_menu_items($a, $b) {
  * @return mixed $items array of menu items, else false.
  */
 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' );
 
 	if ( empty( $items ) )
@@ -429,32 +433,35 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 		return false;
 
 	// 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) );
+	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;
 		}
-	}
-	unset($posts);
-
-	if ( !empty($terms) ) {
-		foreach ( array_keys($terms) as $taxonomy ) {
-			get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
+	
+		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);
 	}
-	unset($terms);
 
 	$items = array_map( 'wp_setup_nav_menu_item', $items );