WordPress.org

Make WordPress Core

Ticket #38843: 38843.2.diff

File 38843.2.diff, 5.0 KB (added by audrasjb, 5 months ago)

patch refreshed against trunk

  • src/wp-includes/taxonomy.php

    diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
    index 623144e5f0..5af4f708b1 100644
    a b function _update_post_term_count( $terms, $taxonomy ) { 
    38833883                $object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
    38843884        }
    38853885
     3886        $post_statuses = array( 'publish' );
     3887
     3888        /**
     3889         * Filters the post statuses for updating the term count.
     3890         *
     3891         * @since 5.7.0
     3892         *
     3893         * @param array $post_statuses List of post statuses to include in the count. Default is 'publish'.
     3894         * @param int   $taxonomy      Current taxonomy object.
     3895         */
     3896        $post_statuses = esc_sql( apply_filters( 'update_post_term_count_statuses', $post_statuses, $taxonomy ) );
     3897
    38863898        foreach ( (array) $terms as $term ) {
    38873899                $count = 0;
    38883900
    38893901                // Attachments can be 'inherit' status, we need to base count off the parent's status if so.
    38903902                if ( $check_attachments ) {
    3891                         $count += (int) $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 = 'attachment' AND term_taxonomy_id = %d", $term ) );
     3903                        $count += (int) $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 IN ('" . implode("', '", $post_statuses ) . "') OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) IN ('" . implode("', '", $post_statuses ) . "') ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
    38923904                }
    38933905
    38943906                if ( $object_types ) {
    38953907                        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.QuotedDynamicPlaceholderGeneration
    3896                         $count += (int) $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 ) );
     3908                        $count += (int) $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 IN ('" . implode("', '", $post_statuses ) . "') AND post_type IN ('" . implode( "', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
    38973909                }
    38983910
    38993911                /** This action is documented in wp-includes/taxonomy.php */
  • tests/phpunit/tests/term/termCounts.php

    diff --git a/tests/phpunit/tests/term/termCounts.php b/tests/phpunit/tests/term/termCounts.php
    index c6fa42e4fc..4dcd7d07de 100644
    a b class Tests_Term_termCount extends WP_UnitTestCase { 
    224224                );
    225225        }
    226226
     227        function add_custom_status_to_counted_statuses( $statuses ) {
     228                array_push( $statuses, 'custom' );
     229                return $statuses;
     230        }
     231
     232        /**
     233         * Term counts incremented correctly when the `update_post_term_count_statuses` filter is used.
     234         *
     235         * @covers ::wp_update_term_count
     236         * @dataProvider data_term_count_changes_for_update_post_term_count_statuses_filter
     237         * @ticket 38843
     238         *
     239         * @param string $post_status New post status.
     240         * @param int    $change      Expected change.
     241         */
     242        public function test_term_count_changes_for_update_post_term_count_statuses_filter( $post_status, $change ) {
     243                $term_count = get_term( self::$attachment_term )->count;
     244
     245                add_filter( 'update_post_term_count_statuses', array( $this, 'add_custom_status_to_counted_statuses' ) );
     246
     247                $post_id = $this->factory()->post->create( array( 'post_status' => $post_status ) );
     248                wp_add_object_terms( $post_id, self::$attachment_term, 'wp_test_tax_counts' );
     249                $attachment_id = self::factory()->attachment->create_object(
     250                        array(
     251                                'file'        => 'image.jpg',
     252                                'post_parent' => $post_id,
     253                                'post_status' => 'inherit',
     254                        )
     255                );
     256                wp_add_object_terms( $attachment_id, self::$attachment_term, 'wp_test_tax_counts' );
     257
     258                $expected = $term_count + $change;
     259                $this->assertSame( $expected, get_term( self::$attachment_term )->count );
     260
     261                remove_filter( 'update_post_term_count_statuses', array( $this, 'add_custom_status_to_counted_statuses' ) );
     262        }
     263
     264        /**
     265         * Data provider for test_term_count_changes_for_update_post_term_count_statuses_filter.
     266         *
     267         * @return array[] {
     268         *     @type string $post_status New post status.
     269         *     @type int    $change      Expected change.
     270         * }
     271         */
     272        function data_term_count_changes_for_update_post_term_count_statuses_filter() {
     273                return array(
     274                        // 0. Published post
     275                        array( 'publish', 2 ),
     276                        // 1. Auto draft
     277                        array( 'auto-draft', 0 ),
     278                        // 2. Draft
     279                        array( 'draft', 0 ),
     280                        // 3. Private post
     281                        array( 'private', 0 ),
     282                        // 4. Custom post status
     283                        array( 'custom', 1 ),
     284                );
     285        }
     286
    227287        /**
    228288         * Term counts incremented correctly for posts with attachment.
    229289         *