Ticket #12348: taxo.diff

wp-includes/taxonomy.php

@@ -1910 +1910 @@
 
         $taxonomy = get_taxonomy($taxonomy);
         if ( !empty($taxonomy->update_count_callback) ) {
-                call_user_func($taxonomy->update_count_callback, $terms);
+                call_user_func($taxonomy->update_count_callback, $terms, $taxonomy);
         } 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 );
+                        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 );
+                        do_action( 'edited_term_taxonomy', $term, $taxonomy );
                 }
 
         }
@@ -2292 +2292 @@
 //
 
 /**
- * Will update term count based on posts.
+ * Will update term count based on object types of taxonomy.
  *
  * Private function for the default callback for post_tag and category
  * taxonomies.
@@ -2304 +2304 @@
  * @uses $wpdb
  *
  * @param array $terms List of Term taxonomy IDs
+ * @param object $taxonomy current taxonomy of terms
  */
-function _update_post_term_count( $terms ) {
+function _update_post_term_count( $terms, $taxonomy ) {
         global $wpdb;
+        
+        if( !is_array($taxonomy->object_type) )
+                $taxonomy->object_type = array($taxonomy->object_type);
 
         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 = 'post' AND term_taxonomy_id = %d", $term ) );
-                do_action( 'edit_term_taxonomy', $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("', '", $taxonomy->object_type)."') 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 ) );
-                do_action( 'edited_term_taxonomy', $term );
+                do_action( 'edited_term_taxonomy', $term, $taxonomy );
         }
 }