From c332da3e12495e869fbfddb822c6406404320e0a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 13 Oct 2015 02:44:23 +0000
Subject: [PATCH] Feeds: Pass the feed name to `do_feed_{$feed}` action.

Props johnbillion.
See #34259.
Built from https://develop.svn.wordpress.org/trunk@35115


git-svn-id: http://core.svn.wordpress.org/trunk@35080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 6 ++++--
 wp-includes/version.php   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 87a8e5da3f..7c9f61f179 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1169,10 +1169,12 @@ function do_feed() {
 	 * Possible values include: 'rdf', 'rss', 'rss2', and 'atom'.
 	 *
 	 * @since 2.1.0
+	 * @since 4.4.0 The `$feed` parameter was added.
 	 *
-	 * @param bool $is_comment_feed Whether the feed is a comment feed.
+	 * @param bool   $is_comment_feed Whether the feed is a comment feed.
+	 * @param string $feed            The feed name.
 	 */
-	do_action( "do_feed_{$feed}", $wp_query->is_comment_feed );
+	do_action( "do_feed_{$feed}", $wp_query->is_comment_feed, $feed );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 96fd658d89..7837698819 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35114';
+$wp_version = '4.4-alpha-35115';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.