Changeset 35098

Timestamp:

10/13/2015 01:06:26 AM (10 years ago)

Author:

DrewAPicture

Message:

Feeds: Simplify logic for checking if the do_feed_{$feed} action is hooked to any callbacks.

See [35097] for where the aforementioned hook was renamed to actually be dynamic, thus rendering creation of the extra $hook variable moot.

See #34264.

File:

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

trunk/src/wp-includes/functions.php

@@ -1159 +1159 @@
         $feed = get_default_feed();
 
-    $hook = 'do_feed_' . $feed;
-    if ( ! has_action( $hook ) )
+    if ( ! has_action( "do_feed_{$feed}" ) ) {
         wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+    }
 
     /**