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

add and apply filter optimizations from FraT. fixes #3875 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-02-28 01:09:20 +00:00
parent a1646d7122
commit 2ecae0f50d
1 changed files with 32 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
wp-includes/plugin.php
View File

@ -7,79 +7,50 @@
function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) { function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
global $wp_filter; global $wp_filter;
// check that we don't already have the same filter at the same priority // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
if ( isset($wp_filter[$tag]["$priority"]) ) { $wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
foreach ( $wp_filter[$tag]["$priority"] as $filter ) {
// uncomment if we want to match function AND accepted_args
// if ( $filter == array($function, $accepted_args) ) {
if ( $filter['function'] == $function_to_add )
return true;
}
}
// So the format is wp_filter['tag']['array of priorities']['array of ['array (functions, accepted_args)]']
$wp_filter[$tag]["$priority"][] = array('function'=>$function_to_add, 'accepted_args'=>$accepted_args);
return true; return true;
} }
function apply_filters($tag, $string) { function apply_filters($tag, $string) {
global $wp_filter; global $wp_filter;
$args = array();
for ( $a = 2; $a < func_num_args(); $a++ )
$args[] = func_get_arg($a);
merge_filters($tag); merge_filters($tag);
if ( !isset($wp_filter[$tag]) ) if ( !isset($wp_filter[$tag]) )
return $string; return $string;
foreach ( (array) $wp_filter[$tag] as $priority => $functions ) { $args = func_get_args();
if ( !is_null($functions) ) {
foreach ( (array) $functions as $function ) { do{
$function_name = $function['function']; foreach( (array) current($wp_filter[$tag]) as $the_ )
$accepted_args = $function['accepted_args']; if ( !is_null($the_['function']) ){
$the_args = $args; $args[1] = $string;
array_unshift($the_args, $string); $string = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
if ( $accepted_args > 0 )
$the_args = array_slice($the_args, 0, $accepted_args);
elseif ( 0 == $accepted_args )
$the_args = NULL;
$string = call_user_func_array($function_name, $the_args);
} }
}
} } while ( next($wp_filter[$tag]) );
return $string; return $string;
} }
function merge_filters($tag) { function merge_filters($tag) {
global $wp_filter; global $wp_filter;
if ( isset($wp_filter['all']) ) {
foreach ( (array) $wp_filter['all'] as $priority => $functions ) {
if ( isset($wp_filter[$tag][$priority]) )
$wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], $wp_filter[$tag][$priority]);
else
$wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], array());
$wp_filter[$tag][$priority] = array_unique($wp_filter[$tag][$priority]);
}
}
if ( isset($wp_filter[$tag]) ) if ( isset($wp_filter['all']) )
uksort( $wp_filter[$tag], "strnatcasecmp" ); $wp_filter[$tag] = array_merge($wp_filter['all'], (array) $wp_filter[$tag]);
if ( isset($wp_filter[$tag]) ){
reset($wp_filter[$tag]);
uksort($wp_filter[$tag], "strnatcasecmp");
}
} }
function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) { function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
global $wp_filter; global $wp_filter;
// rebuild the list of filters unset($GLOBALS['wp_filter'][$tag][$priority][serialize($function_to_remove)]);
if ( isset($wp_filter[$tag]["$priority"]) ) {
$new_function_list = array();
foreach ( (array) $wp_filter[$tag]["$priority"] as $filter ) {
if ( $filter['function'] != $function_to_remove )
$new_function_list[] = $filter;
}
$wp_filter[$tag]["$priority"] = $new_function_list;
}
return true; return true;
} }
@ -107,23 +78,12 @@ function do_action($tag, $arg = '') {
if ( !isset($wp_filter[$tag]) ) if ( !isset($wp_filter[$tag]) )
return; return;
foreach ( (array) $wp_filter[$tag] as $priority => $functions ) { do{
if ( !is_null($functions) ) { foreach( (array) current($wp_filter[$tag]) as $the_ )
foreach ( (array) $functions as $function ) { if ( !is_null($the_['function']) )
$function_name = $function['function']; call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
$accepted_args = $function['accepted_args'];
if ( $accepted_args > 0 ) } while ( next($wp_filter[$tag]) );
$the_args = array_slice($args, 0, $accepted_args);
elseif ( $accepted_args == 0 )
$the_args = NULL;
else
$the_args = $args;
call_user_func_array($function_name, $the_args);
}
}
}
if ( is_array($wp_actions) ) if ( is_array($wp_actions) )
$wp_actions[] = $tag; $wp_actions[] = $tag;
@ -151,22 +111,13 @@ function do_action_ref_array($tag, $args) {
if ( !isset($wp_filter[$tag]) ) if ( !isset($wp_filter[$tag]) )
return; return;
foreach ( (array) $wp_filter[$tag] as $priority => $functions ) { do{
if ( !is_null($functions) ) { foreach( (array) current($wp_filter[$tag]) as $the_ )
foreach ( (array) $functions as $function ) { if ( !is_null($the_['function']) )
$function_name = $function['function']; call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
$accepted_args = $function['accepted_args'];
if ( $accepted_args > 0 ) } while ( next($wp_filter[$tag]) );
$the_args = array_slice($args, 0, $accepted_args);
elseif ( 0 == $accepted_args )
$the_args = NULL;
else
$the_args = $args;
call_user_func_array($function_name, $the_args);
}
}
}
} }
function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) { function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {