From ae0f01904f685f759ca17aa3554c0c7966562ff3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 13 Oct 2015 03:14:25 +0000
Subject: [PATCH] Feeds: Remove a confusing comment from `add_feed()`, added in
 [3638].

It always overrides the default callback if it's set, regardless of the `in_array()` check.

See #34259.
Built from https://develop.svn.wordpress.org/trunk@35121


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

diff --git a/wp-includes/rewrite-functions.php b/wp-includes/rewrite-functions.php
index 6e96edd455..a42535b4a4 100644
--- a/wp-includes/rewrite-functions.php
+++ b/wp-includes/rewrite-functions.php
@@ -100,7 +100,6 @@ function add_feed( $feedname, $function ) {
 	global $wp_rewrite;
 
 	if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) {
-		// Override the file if it is
 		$wp_rewrite->feeds[] = $feedname;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a94ee6120b..48f589264c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35120';
+$wp_version = '4.4-alpha-35121';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.