Changeset 40085

Timestamp:

02/20/2017 06:37:22 AM (7 years ago)

Author:

dd32

Message:

Feeds: Prevent empty feeds from returning 404 errors.

Partial revert of [38929].

This reverts the source code from the commit for #30210 to prevent valid but empty feeds from returning 404 file not found errors for the home and custom feeds.

The tests in the commit that remain applicable are retained.

Props pavelevap for reporting, stevenkword for initial patch, peterwilsoncc.
See #30210.
Merges [40030] to the 4.7 branch.
Fixes #39157.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/feed/rss2.php (modified) (1 diff)

branches/4.7/src/wp-includes/functions.php

@@ -1213 +1213 @@
 function do_feed() {
     global $wp_query;
-
-    // Determine if we are looking at the main comment feed
-    $is_main_comments_feed = ( $wp_query->is_comment_feed() && ! $wp_query->is_singular() );
-
-    /*
-     * Check the queried object for the existence of posts if it is not a feed for an archive,
-     * search result, or main comments. By checking for the absense of posts we can prevent rendering the feed
-     * templates at invalid endpoints. e.g.) /wp-content/plugins/feed/
-     */
-    if ( ! $wp_query->have_posts() && ! ( $wp_query->is_archive() || $wp_query->is_search() || $is_main_comments_feed ) ) {
-        wp_die( __( 'ERROR: This is not a valid feed.' ), '', array( 'response' => 404 ) );
-    }
 
     $feed = get_query_var( 'feed' );

branches/4.7/tests/phpunit/tests/feed/rss2.php

@@ -458 +458 @@
         $this->assertEquals( 1, count( $rss ) );
     }
-
-    /*
-     * Check to make sure we are not rendering feed templates for invalid feed endpoints.
-     * e.g. https://example.com/wp-content/feed/
-     *
-     * @ticket 30210
-     */
-    function test_invalid_feed_endpoint() {
-        // An example of an invalid feed endpoint
-        $this->go_to( 'wp-content/feed/' );
-
-        // Queries performed on invalid feed endpoints should never contain posts.
-        $this->assertFalse( have_posts() );
-
-        // This is the assertion. Once the exception is thrown in do_feed, execution stops, preventing futher assertions.
-        $this->setExpectedException( 'WPDieException', 'ERROR: This is not a valid feed.' );
-        do_feed();
-    }
-
-    /*
-     * Make sure the requested feed is registered before rendering the requested template.
-     *
-     * @ticket 30210
-     */
-    function test_nonexistent_feeds() {
-        global $wp_rewrite;
-        $badfeed = 'badfeed';
-
-        $this->assertNotContains( $badfeed, $wp_rewrite->feeds );
-
-        $this->go_to( '/?feed=' . $badfeed );
-
-        // This is the assertion. Once the exception is thrown in do_feed, execution stops, preventing futher assertions.
-        $this->setExpectedException( 'WPDieException', 'ERROR: This is not a valid feed template.' );
-        do_feed();
-    }
-
 }