Changeset 63035

Timestamp:

08/06/2026 03:16:18 AM (5 weeks ago)

Author:

jorbin

Message:

Comments: Exclude notes from comment feed queries.

Add comment_type != 'note' to the three raw comment feed queries, matching the exclusion already used by WP_Comment_Query and wp_count_comments(). [61105] excluded the note type in WP_Comment_Query, but the comment feed queries are built with raw SQL that bypasses WP_Comment_Query entirely, so the exclusion never reached feeds.

Follow-up to [61105].

Reviewed by jorbin, desrosj.
Merges [62804] to 7.0 branch.

Props adamsilverstein, westonruter, wildworks, mukesh27, odkdn1, khokansardar.
Fixes #65613.

Location:

branches/7.0

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-query.php (modified) (2 diffs)
• tests/phpunit/tests/query/commentFeed.php (modified) (2 diffs)

branches/7.0/src/wp-includes/class-wp-query.php

@@ -2816 +2816 @@
                         if ( $this->is_archive || $this->is_search ) {
                                 $cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID ) $join ";
-                                $cwhere   = "WHERE comment_approved = '1' $where";
+                                $cwhere   = "WHERE comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note' $where";
                                 $cgroupby = "{$wpdb->comments}.comment_id";
                         } else { // Other non-singular, e.g. front.
                                 $cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
-                                $cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";
+                                $cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note'";
                                 $cgroupby = '';
                         }
@@ -3478 +3478 @@
 
                         /** This filter is documented in wp-includes/class-wp-query.php */
-                        $cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
+                        $cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note'", &$this ) );
 
                         /** This filter is documented in wp-includes/class-wp-query.php */

branches/7.0/tests/phpunit/tests/query/commentFeed.php

@@ -7 +7 @@
  */
 class Tests_Query_CommentFeed extends WP_UnitTestCase {
-        public static $post_type   = 'post';
-        protected static $post_ids = array();
+        public static string $post_type = 'post';
+
+        /**
+         * @var int[]
+         */
+        protected static array $post_ids = array();
 
         public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
@@ -84 +88 @@
 
         /**
+         * @ticket 65613
+         */
+        public function test_main_comment_feed_should_exclude_notes(): void {
+                $note_id = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_ids[0],
+                                'comment_type'     => 'note',
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $q = new WP_Query();
+                $q->query(
+                        array(
+                                'withcomments' => 1,
+                                'feed'         => 'comments-rss',
+                        )
+                );
+
+                $this->assertTrue( $q->is_comment_feed() );
+                $this->assertFalse( $q->is_singular() );
+
+                $comment_ids = array_map( 'intval', wp_list_pluck( $q->comments, 'comment_ID' ) );
+                $this->assertNotContains( $note_id, $comment_ids, 'Comments feed should not include notes.' );
+                $this->assertSame( 15, $q->comment_count, 'Comments feed should include all regular comments.' );
+        }
+
+        /**
+         * @ticket 65613
+         */
+        public function test_archive_comment_feed_should_exclude_notes(): void {
+                $note_id = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_ids[0],
+                                'comment_type'     => 'note',
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $q = new WP_Query();
+                $q->query(
+                        array(
+                                'withcomments' => 1,
+                                'feed'         => 'comments-rss',
+                                'year'         => (int) get_the_date( 'Y', self::$post_ids[0] ),
+                        )
+                );
+
+                $this->assertTrue( $q->is_comment_feed() );
+                $this->assertTrue( $q->is_archive() );
+
+                $comment_ids = array_map( 'intval', wp_list_pluck( $q->comments, 'comment_ID' ) );
+                $this->assertNotContains( $note_id, $comment_ids, 'Archive comments feed should not include notes.' );
+                $this->assertSame( 15, $q->comment_count, 'Archive comments feed should include all regular comments.' );
+        }
+
+        /**
+         * @ticket 65613
+         */
+        public function test_single_comment_feed_should_exclude_notes(): void {
+                $post = get_post( self::$post_ids[0] );
+                $this->assertInstanceOf( WP_Post::class, $post );
+
+                $note_id = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => $post->ID,
+                                'comment_type'     => 'note',
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $q = new WP_Query();
+                $q->query(
+                        array(
+                                'withcomments' => 1,
+                                'feed'         => 'comments-rss',
+                                'post_type'    => $post->post_type,
+                                'name'         => $post->post_name,
+                        )
+                );
+
+                $this->assertTrue( $q->is_comment_feed() );
+                $this->assertTrue( $q->is_singular() );
+
+                $comment_ids = array_map( 'intval', wp_list_pluck( $q->comments, 'comment_ID' ) );
+                $this->assertNotContains( $note_id, $comment_ids, 'Singular comments feed should not include notes.' );
+                $this->assertSame( 5, $q->comment_count, 'Singular comments feed should include all regular comments.' );
+        }
+
+        /**
          * @ticket 36904
          */