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

Feeds: Pass the second parameter of `"do_feed_{$feed}"` action, feed name, to callbacks added via `add_feed()`. 

The `$feed` parameter was added in [35115].

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


git-svn-id: http://core.svn.wordpress.org/trunk@35083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-13 02:59:24 +00:00
parent 7de3499949
commit ae9ce0ccd7
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,14 +96,21 @@ function add_permastruct( $name, $struct, $args = array() ) {
* @param callable $function Callback to run on feed display. * @param callable $function Callback to run on feed display.
* @return string Feed action name. * @return string Feed action name.
*/ */
function add_feed($feedname, $function) { function add_feed( $feedname, $function ) {
global $wp_rewrite; global $wp_rewrite;
if ( ! in_array($feedname, $wp_rewrite->feeds) ) //override the file if it is
if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) {
// Override the file if it is
$wp_rewrite->feeds[] = $feedname; $wp_rewrite->feeds[] = $feedname;
}
$hook = 'do_feed_' . $feedname; $hook = 'do_feed_' . $feedname;
// Remove default function hook // Remove default function hook
remove_action($hook, $hook); remove_action( $hook, $hook );
add_action($hook, $function, 10, 1);
add_action( $hook, $function, 10, 2 );
return $hook; return $hook;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35117'; $wp_version = '4.4-alpha-35118';
/** /**
* 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.