<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14560] trunk/wp-includes/nav-menu.php: Don'
t prime menu item cache if a persistent cache is being used.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14560">14560</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-11 15:55:17 +0000 (Tue, 11 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/12734">#12734</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14559 => 14560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-05-11 14:39:00 UTC (rev 14559)
+++ trunk/wp-includes/nav-menu.php 2010-05-11 15:55:17 UTC (rev 14560)
</span><span class="lines">@@ -405,11 +405,15 @@
</span><span class="cx"> * @return mixed $items array of menu items, else false.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_nav_menu_items( $menu, $args = array() ) {
</span><ins>+ global $_wp_using_ext_object_cache;
+
</ins><span class="cx"> $menu = wp_get_nav_menu_object( $menu );
</span><span class="cx">
</span><span class="cx"> if ( ! $menu )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ static $fetched = array();
+
</ins><span class="cx"> $items = get_objects_in_term( $menu->term_id, 'nav_menu' );
</span><span class="cx">
</span><span class="cx"> if ( empty( $items ) )
</span><span class="lines">@@ -429,32 +433,35 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Get all posts and terms at once to prime the caches
</span><del>- $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) );
</del><ins>+ 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;
</ins><span class="cx"> }
</span><del>- }
- unset($posts);
-
- if ( !empty($terms) ) {
- foreach ( array_keys($terms) as $taxonomy ) {
- get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
</del><ins>+
+ 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) );
+ }
</ins><span class="cx"> }
</span><ins>+ unset($posts);
+
+ if ( !empty($terms) ) {
+ foreach ( array_keys($terms) as $taxonomy ) {
+ get_terms($taxonomy, array('include' => $terms[$taxonomy]) );
+ }
+ }
+ unset($terms);
</ins><span class="cx"> }
</span><del>- unset($terms);
</del><span class="cx">
</span><span class="cx"> $items = array_map( 'wp_setup_nav_menu_item', $items );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>