Changeset 40030 for trunk/src/wp-includes/functions.php

Timestamp:

01/29/2017 11:08:54 PM (8 years ago)

Author:

peterwilsoncc

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.
See #30210.
Fixes #39157.

File:

• trunk/src/wp-includes/functions.php (modified) (1 diff)

trunk/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' );