vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 04:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow multiple args to be passed to apply_filters and do_action. Move some code into merge_filters. Use call_user_func_array so that args can be passed by reference. Provide a default for the second arg to do_action so that we do not have to put empty strings in the do_action calls. Bug 768. Hat tip: morganiq

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@2184 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2005-02-01 06:20:54 +00:00
parent 53d75a06d5
commit 02a701f72b
8 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/functions.php
+33 -10
View File
@@ -870,7 +870,7 @@ function is_new_day() {
// Filters: these are the core of WP's plugin architecture
function apply_filters($tag, $string, $filter = true) {
function merge_filters($tag) {
global $wp_filter;
if (isset($wp_filter['all'])) {
foreach ($wp_filter['all'] as $priority => $functions) {
@@ -883,15 +883,22 @@ function apply_filters($tag, $string, $filter = true) {
}
if (isset($wp_filter[$tag])) {
if (isset($wp_filter[$tag]))
ksort($wp_filter[$tag]);
}
function apply_filters($tag, $string) {
global $wp_filter;
$args = array($string) + array_slice(func_get_args(), 3);
merge_filters($tag);
if (isset($wp_filter[$tag])) {
foreach ($wp_filter[$tag] as $priority => $functions) {
if (!is_null($functions)) {
foreach($functions as $function) {
if ($filter)
$string = call_user_func($function, $string);
else
call_user_func($function, $string);
$string = call_user_func_array($function, $args);
}
}
}
@@ -924,9 +931,25 @@ function remove_filter($tag, $function_to_remove, $priority = 10) {
// The *_action functions are just aliases for the *_filter functions, they take special strings instead of generic content
function do_action($tag, $string) {
apply_filters($tag, $string, false);
return $string;
function do_action($tag, $arg = '') {
global $wp_filter;
if ( is_array($arg) )
$args = $arg + array_slice(func_get_args(), 2);
else
$args = array($action) + array_slice(func_get_args(), 2);
merge_filters($tag);
if (isset($wp_filter[$tag])) {
foreach ($wp_filter[$tag] as $priority => $functions) {
if (!is_null($functions)) {
foreach($functions as $function) {
$string = call_user_func_array($function, $args);
}
}
}
}
}
function add_action($tag, $function_to_add, $priority = 10) {
@@ -1064,7 +1087,7 @@ function update_user_cache() {
}
function wp_head() {
do_action('wp_head', '');
do_action('wp_head');
}
function is_single ($post = '') {