Changeset 18932

Timestamp:

10/10/2011 08:52:44 PM (13 years ago)

Author:

ryan

Message:

Count only published posts when updating term counts. Fire term count updates on transition_post_status. Props joehoyle. see #17548

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• post.php (modified) (2 diffs)
• taxonomy.php (modified) (2 diffs)

trunk/wp-includes/default-filters.php

@@ -255 +255 @@
 add_action( 'save_post',                  '_save_post_hook',                          5, 2 );
 add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
+add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
 add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
 add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );

trunk/wp-includes/post.php

@@ -2732 +2732 @@
     wp_transition_post_status('publish', $old_status, $post);
 
-    // 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);
-    }
-
     do_action('edit_post', $post_id, $post);
     do_action('save_post', $post_id, $post);
@@ -5313 +5307 @@
 add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
 
+/**
+ * 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 );
+    }
+}
 ?>

trunk/wp-includes/taxonomy.php

@@ -2448 +2448 @@
     } else {
         // Default count updater
-        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 );
-        }
-
+        _update_post_term_count( $terms, $taxonomy );
     }
 
@@ -2847 +2841 @@
 
     $object_types = is_array($taxonomy->object_type) ? $taxonomy->object_type : array($taxonomy->object_type);
+    
+    foreach ( $object_types as &$object_type )
+        list( $object_type ) = explode( ':', $object_type );
+    
+    $object_types = array_unique( $object_types );
     $object_types = esc_sql($object_types);
 
     foreach ( (array) $terms as $term ) {
-        $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 ) );
+
+        // 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 ) );
+
         do_action( 'edit_term_taxonomy', $term, $taxonomy );
         $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );