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

Remove unnecessary is_null() checks from the worker loops inside do_action(), apply_filters(), etc. fixes #21321. see #21169. 

git-svn-id: http://core.svn.wordpress.org/trunk@21287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-07-20 05:25:37 +00:00
parent c937101f27
commit 70da9092d4
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/plugin.php
View File

@ -164,12 +164,10 @@ function apply_filters($tag, $value) {
$args = func_get_args();
do {
foreach( (array) current($wp_filter[$tag]) as $the_ )
if ( !is_null($the_['function']) ){
foreach( (array) current($wp_filter[$tag]) as $the_ ) {
$args[1] = $value;
$value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
}
} while ( next($wp_filter[$tag]) !== false );
array_pop( $wp_current_filter );
@ -222,10 +220,9 @@ function apply_filters_ref_array($tag, $args) {
reset( $wp_filter[ $tag ] );
do {
foreach( (array) current($wp_filter[$tag]) as $the_ )
if ( !is_null($the_['function']) )
foreach( (array) current($wp_filter[$tag]) as $the_ ) {
$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
}
} while ( next($wp_filter[$tag]) !== false );
array_pop( $wp_current_filter );
@ -263,6 +260,8 @@ function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args
unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
if ( empty($GLOBALS['wp_filter'][$tag][$priority]) )
unset($GLOBALS['wp_filter'][$tag][$priority]);
if ( empty( $GLOBALS['wp_filter'][ $tag ] ) )
unset( $GLOBALS['wp_filter'][ $tag ] );
unset($GLOBALS['merged_filters'][$tag]);
}
@ -398,10 +397,9 @@ function do_action($tag, $arg = '') {
reset( $wp_filter[ $tag ] );
do {
foreach ( (array) current($wp_filter[$tag]) as $the_ )
if ( !is_null($the_['function']) )
foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
}
} while ( next($wp_filter[$tag]) !== false );
array_pop($wp_current_filter);
@ -479,10 +477,9 @@ function do_action_ref_array($tag, $args) {
reset( $wp_filter[ $tag ] );
do {
foreach( (array) current($wp_filter[$tag]) as $the_ )
if ( !is_null($the_['function']) )
foreach( (array) current($wp_filter[$tag]) as $the_ ) {
call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
}
} while ( next($wp_filter[$tag]) !== false );
array_pop($wp_current_filter);
@ -709,10 +706,9 @@ function _wp_call_all_hook($args) {
reset( $wp_filter['all'] );
do {
foreach( (array) current($wp_filter['all']) as $the_ )
if ( !is_null($the_['function']) )
foreach( (array) current($wp_filter['all']) as $the_ ) {
call_user_func_array($the_['function'], $args);
}
} while ( next($wp_filter['all']) !== false );
}