<!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>[14528] trunk/wp-includes:
  Allow turning off object_term and postmeta cache updates.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14528">14528</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-10 00:58:39 +0000 (Mon, 10 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow turning off object_term and postmeta cache updates. Turn off object_term updates in the wp_get_nav_menu_items() get_posts() query to avoid useless taxonomy query.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.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 (14527 => 14528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php        2010-05-09 22:53:25 UTC (rev 14527)
+++ trunk/wp-includes/nav-menu.php        2010-05-10 00:58:39 UTC (rev 14528)
</span><span class="lines">@@ -413,7 +413,8 @@
</span><span class="cx">         $items = get_objects_in_term( $menu-&gt;term_id, 'nav_menu' );
</span><span class="cx"> 
</span><span class="cx">         if ( ! empty( $items ) ) {
</span><del>-                $defaults = array( 'order' =&gt; 'ASC', 'orderby' =&gt; 'menu_order', 'post_type' =&gt; 'nav_menu_item', 'post_status' =&gt; 'publish', 'output' =&gt; ARRAY_A, 'output_key' =&gt; 'menu_order', 'nopaging' =&gt; true );
</del><ins>+                $defaults = array( 'order' =&gt; 'ASC', 'orderby' =&gt; 'menu_order', 'post_type' =&gt; 'nav_menu_item', 'post_status' =&gt; 'publish', 'output' =&gt; ARRAY_A, 'output_key' =&gt; 'menu_order', 'nopaging' =&gt; true,
+                                                  'update_post_term_cache' =&gt; false);
</ins><span class="cx">                 $args = wp_parse_args( $args, $defaults );
</span><span class="cx">                 if ( count( $items ) &gt; 1 )
</span><span class="cx">                         $args['include'] = implode( ',', $items );
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14527 => 14528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-05-09 22:53:25 UTC (rev 14527)
+++ trunk/wp-includes/post.php        2010-05-10 00:58:39 UTC (rev 14528)
</span><span class="lines">@@ -4003,9 +4003,11 @@
</span><span class="cx">  * @uses update_postmeta_cache()
</span><span class="cx">  *
</span><span class="cx">  * @param array $posts Array of Post objects
</span><del>- * @param string $post_type The post type of the posts in $posts
</del><ins>+ * @param string $post_type The post type of the posts in $posts. Default is 'post'.
+ * @param bool $update_term_cache Whether to update the term cache. Default is true.
+ * @param bool $update_meta_cache Whether to update the meta cache. Default is true.
</ins><span class="cx">  */
</span><del>-function update_post_caches(&amp;$posts, $post_type = 'post') {
</del><ins>+function update_post_caches(&amp;$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) {
</ins><span class="cx">         // No point in doing all this work if we didn't match any posts.
</span><span class="cx">         if ( !$posts )
</span><span class="cx">                 return;
</span><span class="lines">@@ -4019,10 +4021,11 @@
</span><span class="cx">         if ( empty($post_type) )
</span><span class="cx">                 $post_type = 'post';
</span><span class="cx"> 
</span><del>-        if ( !is_array($post_type) &amp;&amp; 'any' != $post_type )
</del><ins>+        if ( !is_array($post_type) &amp;&amp; 'any' != $post_type &amp;&amp; $update_term_cache )
</ins><span class="cx">                 update_object_term_cache($post_ids, $post_type);
</span><span class="cx"> 
</span><del>-        update_postmeta_cache($post_ids);
</del><ins>+        if ( $update_meta_cache )
+                update_postmeta_cache($post_ids);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14527 => 14528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-05-09 22:53:25 UTC (rev 14527)
+++ trunk/wp-includes/query.php        2010-05-10 00:58:39 UTC (rev 14528)
</span><span class="lines">@@ -1621,6 +1621,12 @@
</span><span class="cx">                 if ( !isset($q['cache_results']) )
</span><span class="cx">                         $q['cache_results'] = true;
</span><span class="cx"> 
</span><ins>+                if ( !isset($q['update_post_term_cache']) )
+                        $q['update_post_term_cache'] = true;
+
+                if ( !isset($q['update_post_meta_cache']) )
+                        $q['update_post_meta_cache'] = true;
+
</ins><span class="cx">                 if ( !isset($q['post_type']) ) {
</span><span class="cx">                         if ( $this-&gt;is_search )
</span><span class="cx">                                 $q['post_type'] = 'any';
</span><span class="lines">@@ -2504,7 +2510,7 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( $q['cache_results'] )
</span><del>-                        update_post_caches($this-&gt;posts, $post_type);
</del><ins>+                        update_post_caches($this-&gt;posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
</ins><span class="cx"> 
</span><span class="cx">                 if ( $this-&gt;post_count &gt; 0 ) {
</span><span class="cx">                         $this-&gt;post = $this-&gt;posts[0];
</span></span></pre>
</div>
</div>

</body>
</html>