<!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>[18932] trunk/wp-includes: Count only published posts when updating term counts.</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/18932">18932</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-10 20:52:44 +0000 (Mon, 10 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Count only published posts when updating term counts. Fire term count updates on transition_post_status. Props joehoyle. see <a href="http://core.trac.wordpress.org/ticket/17548">#17548</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (18931 => 18932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2011-10-10 19:56:35 UTC (rev 18931)
+++ trunk/wp-includes/default-filters.php 2011-10-10 20:52:44 UTC (rev 18932)
</span><span class="lines">@@ -254,6 +254,7 @@
</span><span class="cx"> add_action( 'publish_post', '_publish_post_hook', 5, 1 );
</span><span class="cx"> add_action( 'save_post', '_save_post_hook', 5, 2 );
</span><span class="cx"> add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
</span><ins>+add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
</ins><span class="cx"> add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
</span><span class="cx"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
</span><span class="cx"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (18931 => 18932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-10-10 19:56:35 UTC (rev 18931)
+++ trunk/wp-includes/post.php 2011-10-10 20:52:44 UTC (rev 18932)
</span><span class="lines">@@ -2731,12 +2731,6 @@
</span><span class="cx"> $post->post_status = 'publish';
</span><span class="cx"> wp_transition_post_status('publish', $old_status, $post);
</span><span class="cx">
</span><del>- // Update counts for the post's terms.
- foreach ( (array) get_object_taxonomies('post') as $taxonomy ) {
- $tt_ids = wp_get_object_terms($post_id, $taxonomy, array('fields' => 'tt_ids'));
- wp_update_term_count($tt_ids, $taxonomy);
- }
-
</del><span class="cx"> do_action('edit_post', $post_id, $post);
</span><span class="cx"> do_action('save_post', $post_id, $post);
</span><span class="cx"> do_action('wp_insert_post', $post_id, $post);
</span><span class="lines">@@ -5312,4 +5306,20 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
</span><span class="cx">
</span><ins>+/**
+ * Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts.
+ *
+ * @access private
+ * @param string $new_status
+ * @param string $old_status
+ * @param object $post
+ * @since 3.3.0
+ */
+function _update_term_count_on_transition_post_status( $new_status, $old_status, $post ) {
+ // Update counts for the post's terms.
+ foreach ( (array) get_object_taxonomies( $post->post_type ) as $taxonomy ) {
+ $tt_ids = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'tt_ids' ) );
+ wp_update_term_count( $tt_ids, $taxonomy );
+ }
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (18931 => 18932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-10-10 19:56:35 UTC (rev 18931)
+++ trunk/wp-includes/taxonomy.php 2011-10-10 20:52:44 UTC (rev 18932)
</span><span class="lines">@@ -2447,13 +2447,7 @@
</span><span class="cx"> call_user_func($taxonomy->update_count_callback, $terms, $taxonomy);
</span><span class="cx"> } else {
</span><span class="cx"> // Default count updater
</span><del>- foreach ( (array) $terms as $term) {
- $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term) );
- do_action( 'edit_term_taxonomy', $term, $taxonomy );
- $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
- do_action( 'edited_term_taxonomy', $term, $taxonomy );
- }
-
</del><ins>+ _update_post_term_count( $terms, $taxonomy );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clean_term_cache($terms, '', false);
</span><span class="lines">@@ -2846,10 +2840,21 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $object_types = is_array($taxonomy->object_type) ? $taxonomy->object_type : array($taxonomy->object_type);
</span><ins>+
+ foreach ( $object_types as &$object_type )
+ list( $object_type ) = explode( ':', $object_type );
+
+ $object_types = array_unique( $object_types );
</ins><span class="cx"> $object_types = esc_sql($object_types);
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $terms as $term ) {
</span><del>- $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types) . "') AND term_taxonomy_id = %d", $term ) );
</del><ins>+
+ // Attachments can be 'inherit' status, we need to base count off the parent's staus if so
+ if ( in_array( 'attachment', $object_types ) )
+ $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type IN ('" . implode("', '", $object_types) . "') AND term_taxonomy_id = %d", $term ) );
+ else
+ $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types) . "') AND term_taxonomy_id = %d", $term ) );
+
</ins><span class="cx"> do_action( 'edit_term_taxonomy', $term, $taxonomy );
</span><span class="cx"> $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
</span><span class="cx"> do_action( 'edited_term_taxonomy', $term, $taxonomy );
</span></span></pre>
</div>
</div>
</body>
</html>