Ticket #20899: 20899.3.diff

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

@@ -960 +960 @@
                 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
@@ -3670 +3670 @@
          */
         public function is_front_page() {
                 // most likely case
-                if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
+                if ( 'posts' == get_option( 'show_on_front') && $this->is_home() && ! $this->is_feed() )
                         return true;
                 elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
                         return true;

tests/phpunit/tests/query/conditionals.php

@@ -251 +251 @@
                 $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
                 // long version
-                foreach ($feeds as $feed) {
-                        $this->go_to("/feed/{$feed}/");
-                        $this->assertQueryTrue('is_feed');
+                foreach ( $feeds as $feed ) {
+                        $this->go_to( "/feed/{$feed}/" );
+                        $this->assertQueryTrue( 'is_home', 'is_feed' );
                 }
 
                 // short version
-                foreach ($feeds as $feed) {
-                        $this->go_to("/{$feed}/");
-                        $this->assertQueryTrue('is_feed');
+                foreach ( $feeds as $feed ) {
+                        $this->go_to( "/{$feed}/" );
+                        $this->assertQueryTrue( 'is_home', 'is_feed' );
                 }
-
         }
 
         function test_main_feed() {
@@ -269 +268 @@
                 $types = array('rss2', 'rss', 'atom');
                 foreach ($types as $type) {
                         $this->go_to(get_feed_link($type));
-                        $this->assertQueryTrue('is_feed');
+                        $this->assertQueryTrue( 'is_home', 'is_feed' );
                 }
         }
 
+        /**
+         * @ticket 20899
+         */
+        function test_main_feed_is_home() {
+                $this->go_to( '/?feed=rss2' );
+
+                $this->assertQueryTrue( 'is_feed', 'is_home' );
+        }
+
+        /**
+         * @ticket 20899
+         */
+        function test_main_feed_is_home_page_on_front() {
+                $page_on_front = self::factory()->post->create( array(
+                        'post_type' => 'page',
+                ) );
+
+                $page_for_posts = self::factory()->post->create( array(
+                        'post_type' => 'page',
+                ) );
+
+                update_option( 'show_on_front', 'page' );
+                update_option( 'page_on_front', $page_on_front );
+                update_option( 'page_for_posts', $page_for_posts );
+
+                $this->go_to( '/?feed=rss2' );
+                $this->assertQueryTrue( 'is_feed', 'is_home' );
+
+                update_option( 'show_on_front', 'posts' );
+                delete_option( 'page_on_front' );
+                delete_option( 'page_for_posts' );
+        }
+
         // 'page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
         function test_paged() {
                 update_option( 'posts_per_page', 2 );
@@ -295 +327 @@
 
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
-                foreach ($types as $type) {
-                                $this->go_to("/comments/feed/{$type}");
-                                $this->assertQueryTrue('is_feed', 'is_comment_feed');
+                foreach ( $types as $type ) {
+                        $this->go_to( "/comments/feed/{$type}" );
+                        $this->assertQueryTrue( 'is_feed', 'is_comment_feed', 'is_home' );
                 }
 
                 // check the short form
-                $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
-                foreach ($types as $type) {
-                                $this->go_to("/comments/{$type}");
-                                $this->assertQueryTrue('is_feed', 'is_comment_feed');
+                $types = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+                foreach ( $types as $type ) {
+                        $this->go_to( "/comments/{$type}" );
+                        $this->assertQueryTrue( 'is_feed', 'is_comment_feed', 'is_home' );
                 }
-
         }
 
         // 'search/(.+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',