From 0370bda8bc6e25463a4d6088c0c8b58cc636b9c6 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 10 Oct 2011 20:52:44 +0000 Subject: [PATCH] Count only published posts when updating term counts. Fire term count updates on transition_post_status. Props joehoyle. see #17548 git-svn-id: http://svn.automattic.com/wordpress/trunk@18932 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-filters.php | 1 + wp-includes/post.php | 22 ++++++++++++++++------ wp-includes/taxonomy.php | 21 +++++++++++++-------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 2507a8848..de1897139 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -254,6 +254,7 @@ add_action( 'pre_post_update', 'wp_save_post_revision' add_action( 'publish_post', '_publish_post_hook', 5, 1 ); 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' ); add_action( 'admin_init', 'send_frame_options_header', 10, 0 ); diff --git a/wp-includes/post.php b/wp-includes/post.php index 994de88dc..d305dd82e 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -2731,12 +2731,6 @@ function wp_publish_post($post_id) { $post->post_status = 'publish'; 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); do_action('wp_insert_post', $post_id, $post); @@ -5312,4 +5306,20 @@ function _post_format_wp_get_object_terms( $terms ) { } 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 ); + } +} ?> diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 19bc1cd79..ced5002a0 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -2447,13 +2447,7 @@ function wp_update_term_count_now( $terms, $taxonomy ) { 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, $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 ); } clean_term_cache($terms, '', false); @@ -2846,10 +2840,21 @@ function _update_post_term_count( $terms, $taxonomy ) { global $wpdb; $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 ) ); do_action( 'edited_term_taxonomy', $term, $taxonomy );