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

Fix do_action arg handling. http://mosquito.wordpress.org/view.php?id=901 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-03-11 00:57:34 +00:00
parent 379367cfbe
commit 5a295374c6
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/functions.php
View File

@ -897,16 +897,16 @@ function apply_filters($tag, $string) {
$accepted_args = $function['accepted_args']; $accepted_args = $function['accepted_args'];
if($accepted_args == 1) { if($accepted_args == 1) {
$args = array($string); $the_args = array($string);
} elseif ($accepted_args > 1) { } elseif ($accepted_args > 1) {
$args = array_slice($all_args, 0, $accepted_args); $the_args = array_slice($all_args, 0, $accepted_args);
} elseif($accepted_args == 0) { } elseif($accepted_args == 0) {
$args = NULL; $the_args = NULL;
} else { } else {
$args = $all_args; $the_args = $all_args;
} }
$string = call_user_func_array($function_name, $args); $string = call_user_func_array($function_name, $the_args);
} }
} }
} }
@ -952,8 +952,8 @@ function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args
function do_action($tag, $arg = '') { function do_action($tag, $arg = '') {
global $wp_filter; global $wp_filter;
$extra_args = array_slice(func_get_args(), 2); $extra_args = array_slice(func_get_args(), 2);
if ( is_array($arg) ) if ( is_array($arg) )
$args = array_merge($arg, $extra_args); $args = array_merge($arg, $extra_args);
else else
$args = array_merge(array($arg), $extra_args); $args = array_merge(array($arg), $extra_args);
@ -966,21 +966,23 @@ function do_action($tag, $arg = '') {
if (!is_null($functions)) { if (!is_null($functions)) {
foreach($functions as $function) { foreach($functions as $function) {
$all_args = array_merge(array($string), $args);
$function_name = $function['function']; $function_name = $function['function'];
$accepted_args = $function['accepted_args']; $accepted_args = $function['accepted_args'];
if($accepted_args == 1) { if($accepted_args == 1) {
$args = array($string); if ( is_array($arg) )
$the_args = $arg;
else
$the_args = array($arg);
} elseif ($accepted_args > 1) { } elseif ($accepted_args > 1) {
$args = array_slice($all_args, 0, $accepted_args); $the_args = array_slice($args, 0, $accepted_args);
} elseif($accepted_args == 0) { } elseif($accepted_args == 0) {
$args = NULL; $the_args = NULL;
} else { } else {
$args = $all_args; $the_args = $args;
} }
$string = call_user_func_array($function_name, $args); $string = call_user_func_array($function_name, $the_args);
} }
} }
} }