Ticket #16661: 16661.diff

wp-includes/plugin.php

@@ -174 +174 @@
 }
 
 /**
- * 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.
  *
  * This function removes a function attached to a specified filter hook. This
@@ -420 +367 @@
 }
 
 /**
- * Execute functions hooked on a specific action hook, specifying arguments in an array.
- *
- * @see do_action() 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 2.1
- * @global array $wp_filter Stores all of the filters
- * @global array $wp_actions Increments the amount of times action was triggered.
- *
- * @param string $tag The name of the action to be executed.
- * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt>
- * @return null Will return null if $tag does not exist in $wp_filter array
- */
-function do_action_ref_array($tag, $args) {
-        global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
-
-        if ( ! isset($wp_actions) )
-                $wp_actions = array();
-
-        if ( ! isset($wp_actions[$tag]) )
-                $wp_actions[$tag] = 1;
-        else
-                ++$wp_actions[$tag];
-
-        $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;
-        }
-
-        // 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']) )
-                                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);
-}
-
-/**
  * Check if any action has been registered for a hook.
  *
  * @package WordPress

wp-includes/deprecated.php

@@ -2602 +2602 @@
         return true;
 }
 
+
+/**
+ * Execute functions hooked on a specific action hook, specifying arguments in an array.
+ *
+ * @see do_action() This function is identical, but the arguments passed to the
+ * functions hooked to <tt>$tag</tt> are supplied using an array.
+ *
+ * @since 2.1
+ * @deprecated 3.2
+ *
+ * @param string $tag The name of the action to be executed.
+ * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt>
+ * @return null Will return null if $tag does not exist in $wp_filter array
+ */
+function do_action_ref_array( $tag, $args ) {
+        _deprecated_function( __FUNCTION__, '3.2', 'do_action()' );
+
+        array_unshift( $args, $tag );
+
+        return call_user_func_array( 'do_action', $args );
+}
+
+/**
+ * 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.
+ *
+ * @since 3.0
+ * @deprecated 3.2
+ *
+ * @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 ) {
+        _deprecated_function( __FUNCTION__, '3.2', 'apply_filters()' );
+
+        array_unshift( $args, $tag );
+
+        return call_user_func_array( 'apply_filters', $args );
+}
+