Changeset 61337

Timestamp:

12/01/2025 03:42:24 PM (12 days ago)

Author:

ellatrix

Message:

Notes: Avoid incrementing comment_count when notes are resolved or reopened.

Follow-up to [60987].

Reviewed by ellatrix.
Merges [61336] to the 6.9 branch.

Props hbhalodia, wildworks, shimotomoki, gulamdastgir04, JeffPaul, ellatrix, SergeyBiryukov.
Fixes #64325.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment/wpUpdateCommentCountNow.php (modified) (1 diff)

branches/6.9/src/wp-includes/comment.php

@@ -2873 +2873 @@
 
     if ( is_null( $new ) ) {
-        $new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id ) );
+        $new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1' AND comment_type != 'note'", $post_id ) );
     } else {
         $new = (int) $new;

branches/6.9/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php

@@ -47 +47 @@
     }
 
+    /**
+    * @ticket 64325
+    */
+    public function test_only_approved_regular_comments_are_counted() {
+        $post_id = self::factory()->post->create();
+
+        self::factory()->comment->create(
+            array(
+                'comment_post_ID'  => $post_id,
+                'comment_approved' => 0,
+            )
+        );
+        self::factory()->comment->create(
+            array(
+                'comment_post_ID'  => $post_id,
+                'comment_approved' => 1,
+            )
+        );
+        self::factory()->comment->create(
+            array(
+                'comment_post_ID'  => $post_id,
+                'comment_type'     => 'note',
+                'comment_approved' => 0,
+            )
+        );
+        self::factory()->comment->create(
+            array(
+                'comment_post_ID'  => $post_id,
+                'comment_type'     => 'note',
+                'comment_approved' => 1,
+            )
+        );
+
+        $this->assertTrue( wp_update_comment_count_now( $post_id ) );
+        $this->assertSame( '1', get_comments_number( $post_id ) );
+    }
+
     public function _return_100() {
         return 100;