Changeset 18932 for trunk/wp-includes/taxonomy.php

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

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

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 ) );