Wordpress 3.0.4-scripts

[autoinstalls/wordpress.git] / wp-includes / plugin.php

diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 29134ac47d6e680d6ad22191e7f6a4d3b7da0ffe..c87e4172262969c250bee55865de7294948c96af 100644 (file)
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -173,6 +173,59 @@ function apply_filters($tag, $value) {
        return $value;
 }
 
+/**
+ * Execute functions hooked on a specific filter hook, specifying arguments in an array.
+ *
+ * @see apply_filters() This function is identical, but the arguments passed to the
+ * functions hooked to <tt>$tag</tt> are supplied using an array.
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 3.0.0
+ * @global array $wp_filter Stores all of the filters
+ * @global array $merged_filters Merges the filter hooks using this function.
+ * @global array $wp_current_filter stores the list of current filters with the current one last
+ *
+ * @param string $tag The name of the filter hook.
+ * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt>
+ * @return mixed The filtered value after all hooked functions are applied to it.
+ */
+function apply_filters_ref_array($tag, $args) {
+       global $wp_filter, $merged_filters, $wp_current_filter;
+
+       $wp_current_filter[] = $tag;
+
+       // Do 'all' actions first
+       if ( isset($wp_filter['all']) ) {
+               $all_args = func_get_args();
+               _wp_call_all_hook($all_args);
+       }
+
+       if ( !isset($wp_filter[$tag]) ) {
+               array_pop($wp_current_filter);
+               return $args[0];
+       }
+
+       // Sort
+       if ( !isset( $merged_filters[ $tag ] ) ) {
+               ksort($wp_filter[$tag]);
+               $merged_filters[ $tag ] = true;
+       }
+
+       reset( $wp_filter[ $tag ] );
+
+       do {
+               foreach( (array) current($wp_filter[$tag]) as $the_ )
+                       if ( !is_null($the_['function']) )
+                               $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 );
+
+       return $args[0];
+}
+
 /**
  * Removes a function from a specified filter hook.
  *
@@ -222,7 +275,7 @@ function remove_all_filters($tag, $priority = false) {
        global $wp_filter, $merged_filters;
 
        if( isset($wp_filter[$tag]) ) {
-               if( false !== $priority && isset($$wp_filter[$tag][$priority]) )
+               if( false !== $priority && isset($wp_filter[$tag][$priority]) )
                        unset($wp_filter[$tag][$priority]);
                else
                        unset($wp_filter[$tag]);
@@ -299,10 +352,13 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1)
 function do_action($tag, $arg = '') {
        global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-       if ( is_array($wp_actions) )
-               $wp_actions[] = $tag;
+       if ( ! isset($wp_actions) )
+               $wp_actions = array();
+
+       if ( ! isset($wp_actions[$tag]) )
+               $wp_actions[$tag] = 1;
        else
-               $wp_actions = array($tag);
+               ++$wp_actions[$tag];
 
        $wp_current_filter[] = $tag;
 
@@ -318,7 +374,7 @@ function do_action($tag, $arg = '') {
        }
 
        $args = array();
-       if ( is_array($arg) && 1 == count($arg) && is_object($arg[0]) ) // array(&$this)
+       if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
                $args[] =& $arg[0];
        else
                $args[] = $arg;
@@ -357,10 +413,10 @@ function do_action($tag, $arg = '') {
 function did_action($tag) {
        global $wp_actions;
 
-       if ( empty($wp_actions) )
+       if ( ! isset( $wp_actions ) || ! isset( $wp_actions[$tag] ) )
                return 0;
 
-       return count(array_keys($wp_actions, $tag));
+       return $wp_actions[$tag];
 }
 
 /**
@@ -382,10 +438,13 @@ function did_action($tag) {
 function do_action_ref_array($tag, $args) {
        global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-       if ( !is_array($wp_actions) )
-               $wp_actions = array($tag);
+       if ( ! isset($wp_actions) )
+               $wp_actions = array();
+
+       if ( ! isset($wp_actions[$tag]) )
+               $wp_actions[$tag] = 1;
        else
-               $wp_actions[] = $tag;
+               ++$wp_actions[$tag];
 
        $wp_current_filter[] = $tag;
 
@@ -675,9 +734,17 @@ function _wp_filter_build_unique_id($tag, $function, $priority) {
        global $wp_filter;
        static $filter_id_count = 0;
 
-       if ( is_string($function) ) {
+       if ( is_string($function) )
                return $function;
-       } else if (is_object($function[0]) ) {
+
+       if ( is_object($function) ) {
+               // Closures are currently implemented as objects
+               $function = array( $function, '' );
+       } else {
+               $function = (array) $function;
+       }
+
+       if (is_object($function[0]) ) {
                // Object Class Calling
                if ( function_exists('spl_object_hash') ) {
                        return spl_object_hash($function[0]) . $function[1];
@@ -692,7 +759,7 @@ function _wp_filter_build_unique_id($tag, $function, $priority) {
                        } else {
                                $obj_idx .= $function[0]->wp_filter_id;
                        }
-       
+
                        return $obj_idx;
                }
        } else if ( is_string($function[0]) ) {