Ticket #26869: do_feed.diff

src/wp-includes/functions.php

@@ -1079 +1079 @@
         if ( $feed == '' || $feed == 'feed' )
                 $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 ) );
 
         /**
          * Fires once the given feed is loaded.
          *
-         * The dynamic hook name, $hook, refers to the feed name.
+         * The dynamic portion of the hook name, $feed, refers to the feed name.
          *
          * @since 2.1.0
          *
          * @param bool $is_comment_feed Whether the feed is a comment feed.
          */
-        do_action( $hook, $wp_query->is_comment_feed );
+        do_action( "do_feed_{$feed}", $wp_query->is_comment_feed );
 }
 
 /**