From 77e2cd9e18f7a88039623c660d08cd8604b3326f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 13 Oct 2015 02:58:21 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@35118 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/rewrite-functions.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/rewrite-functions.php b/src/wp-includes/rewrite-functions.php index ef8846a36f..5c9003d2f8 100644 --- a/src/wp-includes/rewrite-functions.php +++ b/src/wp-includes/rewrite-functions.php @@ -96,14 +96,21 @@ function add_permastruct( $name, $struct, $args = array() ) { * @param callable $function Callback to run on feed display. * @return string Feed action name. */ -function add_feed($feedname, $function) { +function add_feed( $feedname, $function ) { 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; + } + $hook = 'do_feed_' . $feedname; + // Remove default function hook - remove_action($hook, $hook); - add_action($hook, $function, 10, 1); + remove_action( $hook, $hook ); + + add_action( $hook, $function, 10, 2 ); + return $hook; }