IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feeds: Simplify logic for checking if the do_feed_{$feed} action is hooked to any callbacks.

Browse Source 
See [35097] for where the aforementioned hook was renamed to actually be dynamic, thus rendering creation of the extra `$hook` variable moot.

See #34264.

Built from https://develop.svn.wordpress.org/trunk@35098


git-svn-id: http://core.svn.wordpress.org/trunk@35063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-10-13 01:07:25 +00:00
parent b234b5d896
commit 48811702cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/functions.php
View File

@ -1158,9 +1158,9 @@ function do_feed() {
if ( $feed == '' || $feed == 'feed' ) if ( $feed == '' || $feed == 'feed' )
$feed = get_default_feed(); $feed = get_default_feed();
$hook = 'do_feed_' . $feed; if ( ! has_action( "do_feed_{$feed}" ) ) {
if ( ! has_action( $hook ) )
wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) ); wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
}
/** /**
* Fires once the given feed is loaded. * Fires once the given feed is loaded.

2
wp-includes/version.php
View File

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