Changeset 61535

Timestamp:

01/27/2026 02:17:07 AM (6 months ago)

Author:

wildworks

Message:

Comments: Explicitly exclude note comment type on the comments table.

Fix an issue where adding comment_type=all as a query parameter to the wp-admin/edit-comments.php page would unexpectedly cause notes to show.

Follow-up to [61183].

Reviewed by jorbin.
Merges [61525] to the 6.9 branch.

Props adamsilverstein, jorbin, mukesh27, ozgursar, Presskopp, r1k0, rollybueno, soyebsalar01, westonruter, wildworks.
Fixes #64474.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• tests/phpunit/tests/admin/wpCommentsListTable.php (modified) (3 diffs)

branches/6.9/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -152 +152 @@
                         'post_id'                   => $post_id,
                         'type'                      => $comment_type,
+                        'type__not_in'              => array( 'note' ),
                         'orderby'                   => $orderby,
                         'order'                     => $order,

branches/6.9/tests/phpunit/tests/admin/wpCommentsListTable.php

@@ -219 +219 @@
          *
          * @ticket 64198
-         */
-        public function test_comments_list_table_does_not_show_note_comment_type() {
-                $post_id    = self::factory()->post->create();
-                $note_id    = self::factory()->comment->create(
+         * @ticket 64474
+         *
+         * @dataProvider data_comment_type
+         *
+         * @param string $comment_type The comment_type parameter value to test.
+         */
+        public function test_comments_list_table_does_not_show_note_comment_type( string $comment_type ) {
+                $post_id = self::factory()->post->create();
+                self::factory()->comment->create(
                         array(
                                 'comment_post_ID'  => $post_id,
@@ -228 +233 @@
                                 'comment_type'     => 'note',
                                 'comment_approved' => '1',
-                        )
-                );
-                $comment_id = self::factory()->comment->create(
+                                'comment_date'     => '2024-01-01 10:00:00',
+                                'comment_date_gmt' => '2024-01-01 10:00:00',
+                        )
+                );
+                $regular_comment_id       = self::factory()->comment->create(
                         array(
                                 'comment_post_ID'  => $post_id,
@@ -236 +243 @@
                                 'comment_type'     => '',
                                 'comment_approved' => '1',
-                        )
-                );
-                // Request the note comment type.
-                $_REQUEST['comment_type'] = 'note';
+                                'comment_date'     => '2024-01-01 11:00:00',
+                                'comment_date_gmt' => '2024-01-01 11:00:00',
+                        )
+                );
+                $pingback_comment_id      = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => $post_id,
+                                'comment_content'  => 'This is a pingback comment.',
+                                'comment_type'     => '',
+                                'comment_approved' => '1',
+                                'comment_date'     => '2024-01-01 12:00:00',
+                                'comment_date_gmt' => '2024-01-01 12:00:00',
+                        )
+                );
+                $_REQUEST['comment_type'] = $comment_type;
                 $this->table->prepare_items();
                 $items = $this->table->items;
-                $this->assertCount( 1, $items );
-                $this->assertEquals( $comment_id, $items[0]->comment_ID );
+                $this->assertCount( 2, $items );
+                $this->assertEquals( $pingback_comment_id, $items[0]->comment_ID );
+                $this->assertEquals( $regular_comment_id, $items[1]->comment_ID );
+        }
+
+        /**
+         * Data provider for test_comments_list_table_does_not_show_note_comment_type().
+         *
+         * @return array<string, string[]>
+         */
+        public function data_comment_type(): array {
+                return array(
+                        'note type explicitly requested' => array( 'note' ),
+                        'all type requested'             => array( 'all' ),
+                );
         }
 }