Ticket #20899: 20899.2.diff

src/wp-includes/query.php

@@ -1771 +1771 @@
                 if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
                         $this->is_comment_feed = true;
 
-                if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
+                if ( !( $this->is_singular || $this->is_archive || $this->is_search || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
                         $this->is_home = true;
 
                 // Correct is_* for page_on_front and page_for_posts

tests/phpunit/tests/feed/rss2.php

@@ -113 +113 @@
         }
 
         /**
+         * @ticket 20899
+         */
+        function test_main_rss_should_be_home_and_feed() {
+                $this->go_to( '/?feed=rss2' );
+
+                $this->assertTrue( is_home() && is_feed() );
+        }
+
+        /**
          * [test_channel_element description]
          * @return [type] [description]
          */