<!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>[14310] trunk/wp-includes: Update object term cache for custom post types.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14310">14310</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-29 20:43:59 +0000 (Thu, 29 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update object term cache for custom post types. props scribu, fixes <a href="http://trac.wordpress.org/ticket/12989">#12989</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14309 => 14310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-04-29 20:19:47 UTC (rev 14309)
+++ trunk/wp-includes/post.php 2010-04-29 20:43:59 UTC (rev 14310)
</span><span class="lines">@@ -3982,8 +3982,9 @@
</span><span class="cx"> * @uses update_postmeta_cache()
</span><span class="cx"> *
</span><span class="cx"> * @param array $posts Array of Post objects
</span><ins>+ * @param string $post_type The post type of the posts in $posts
</ins><span class="cx"> */
</span><del>-function update_post_caches(&$posts) {
</del><ins>+function update_post_caches(&$posts, $post_type = 'post') {
</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">@@ -3991,11 +3992,14 @@
</span><span class="cx"> update_post_cache($posts);
</span><span class="cx">
</span><span class="cx"> $post_ids = array();
</span><ins>+ foreach ( $posts as $post )
+ $post_ids[] = $post->ID;
</ins><span class="cx">
</span><del>- for ($i = 0; $i < count($posts); $i++)
- $post_ids[] = $posts[$i]->ID;
</del><ins>+ if ( empty($post_type) )
+ $post_type = 'post';
</ins><span class="cx">
</span><del>- update_object_term_cache($post_ids, 'post');
</del><ins>+ if ( !is_array($post_type) && 'any' != $post_type )
+ update_object_term_cache($post_ids, $post_type);
</ins><span class="cx">
</span><span class="cx"> update_postmeta_cache($post_ids);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14309 => 14310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-04-29 20:19:47 UTC (rev 14309)
+++ trunk/wp-includes/query.php 2010-04-29 20:43:59 UTC (rev 14310)
</span><span class="lines">@@ -1626,6 +1626,9 @@
</span><span class="cx"> if ( !isset($q['suppress_filters']) )
</span><span class="cx"> $q['suppress_filters'] = false;
</span><span class="cx">
</span><ins>+ if ( !isset($q['cache_results']) )
+ $q['cache_results'] = true;
+
</ins><span class="cx"> if ( !isset($q['post_type']) ) {
</span><span class="cx"> if ( $this->is_search )
</span><span class="cx"> $q['post_type'] = 'any';
</span><span class="lines">@@ -2504,7 +2507,8 @@
</span><span class="cx"> $this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_post_caches($this->posts);
</del><ins>+ if ( $q['cache_results'] )
+ update_post_caches($this->posts, $post_type);
</ins><span class="cx">
</span><span class="cx"> if ($this->post_count > 0) {
</span><span class="cx"> $this->post = $this->posts[0];
</span></span></pre>
</div>
</div>
</body>
</html>