WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2015-10-13 03:14:25 +00:00
parent cd563fd404
commit ae0f01904f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/rewrite-functions.php
View File

@ -100,7 +100,6 @@ function add_feed( $feedname, $function ) {
global $wp_rewrite; global $wp_rewrite;
if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) { if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) {
// Override the file if it is
$wp_rewrite->feeds[] = $feedname; $wp_rewrite->feeds[] = $feedname;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.