<!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" />
<title>[21981] trunk/wp-includes: Fetch full terms for the post_category and tags_input queries and then wp_list_pluck() the desired fields.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21981">21981</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-09-24 20:35:56 +0000 (Mon, 24 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fetch full terms for the post_category and tags_input queries and then wp_list_pluck() the desired fields. Fetching full terms primes the cache and reduces overall queries. Add cache invalidation to wp_set_post_terms(). Props scribu. see <a href="http://core.trac.wordpress.org/ticket/21309">#21309</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (21980 => 21981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php        2012-09-24 19:44:42 UTC (rev 21980)
+++ trunk/wp-includes/category-template.php        2012-09-24 20:35:56 UTC (rev 21981)
</span><span class="lines">@@ -1062,6 +1062,9 @@
</span><span class="cx">         if ( ! $post = get_post( $post ) )
</span><span class="cx">                 return false;
</span><span class="cx"> 
</span><ins>+        if ( ! is_object_in_taxonomy( $post-&gt;post_type, $taxonomy ) )
+                return false;
+
</ins><span class="cx">         $terms = get_object_term_cache( $post-&gt;ID, $taxonomy );
</span><span class="cx">         if ( false === $terms ) {
</span><span class="cx">                 $terms = wp_get_object_terms( $post-&gt;ID, $taxonomy );
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (21980 => 21981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2012-09-24 19:44:42 UTC (rev 21980)
+++ trunk/wp-includes/post.php        2012-09-24 20:35:56 UTC (rev 21981)
</span><span class="lines">@@ -496,17 +496,19 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( 'post_category' == $key ) {
</span><del>-                        if ( is_object_in_taxonomy( $this-&gt;post_type, 'category' ) )
-                                return wp_get_post_categories( $this-&gt;ID );
-                        else
</del><ins>+                        $terms = get_the_terms( $this, 'category' );
+                        if ( ! $terms )
</ins><span class="cx">                                 return array();
</span><ins>+
+                        return wp_list_pluck( $terms, 'term_id' );
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( 'tags_input' == $key ) {
</span><del>-                        if ( is_object_in_taxonomy( $this-&gt;post_type, 'post_tag' ) )
-                                return wp_get_post_tags( $this-&gt;ID, array( 'fields' =&gt; 'names' ) );
-                        else
</del><ins>+                        $terms = get_the_terms( $this, 'post_tag' );
+                        if ( ! $terms )
</ins><span class="cx">                                 return array();
</span><ins>+
+                        return wp_list_pluck( $terms, 'name' );
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 // Rest of the values need filtering
</span><span class="lines">@@ -3041,11 +3043,16 @@
</span><span class="cx">         // Hierarchical taxonomies must always pass IDs rather than names so that children with the same
</span><span class="cx">         // names but different parents aren't confused.
</span><span class="cx">         if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><del>-                $tags = array_map( 'intval', $tags );
-                $tags = array_unique( $tags );
</del><ins>+                $tags = array_unique( array_map( 'intval', $tags ) );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
</del><ins>+        $r = wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
+        if ( is_wp_error( $r ) )
+                return $r;
+
+        wp_cache_delete( $post_id, $taxonomy . '_relationships' );
+
+        return $r;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -3074,12 +3081,7 @@
</span><span class="cx">                 return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if ( !empty($post_categories) ) {
-                $post_categories = array_map('intval', $post_categories);
-                $post_categories = array_unique($post_categories);
-        }
-
-        return wp_set_object_terms($post_ID, $post_categories, 'category');
</del><ins>+        return wp_set_post_terms($post_ID, $post_categories, 'category');
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>

</body>
</html>