Changeset 36138

Timestamp:

12/31/2015 05:15:23 PM (9 years ago)

Author:

rachelbaker

Message:

Feeds: Comments on attachments display in the site-wide comments RSS feed.

Individual attachment pages already have their own RSS comment feed, and would be expected to be included in the site-wide comments RSS feed.

Props jbrinley.
Fixes #15610

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (1 diff)
• tests/phpunit/tests/query/conditionals.php (modified) (1 diff)
• tests/phpunit/tests/query/results.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -3194 +3194 @@
             } 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' AND comment_approved = '1'";
+                $cwhere = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' && post_type = 'attachment' ) ) AND comment_approved = '1'";
                 $cgroupby = '';
             }

trunk/tests/phpunit/tests/query/conditionals.php

@@ -56 +56 @@
         $this->go_to( get_post_comments_feed_link( $post_id ) );
         $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
+    }
+
+    function test_attachment_comments_feed() {
+        $attachment_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
+        self::factory()->comment->create_post_comments( $attachment_id, 2 );
+        $this->go_to( get_post_comments_feed_link( $attachment_id ) );
+        $this->assertQueryTrue( 'is_feed', 'is_attachment', 'is_single', 'is_singular', 'is_comment_feed' );
     }
 

trunk/tests/phpunit/tests/query/results.php

@@ -704 +704 @@
         $this->assertCount( 0, $result2 );
     }
+
+    /**
+     * @ticket 15610
+     */
+    public function test_main_comments_feed_includes_attachment_comments() {
+        $attachment_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
+        $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $attachment_id, 'comment_approved' => '1' ) );
+
+        $this->q->query( array( 'withcomments' => 1, 'feed' => 'feed' ) );
+
+        $this->assertTrue( $this->q->have_comments() );
+
+        $feed_comment = $this->q->next_comment();
+        $this->assertEquals( $comment_id, $feed_comment->comment_ID );
+    }
 }