Changeset 6316

Timestamp:

11/06/07 18:31:43 (1 year ago)

Author:

ryan

Message:

Separate action and filter arrays. Get rid of filter merging. fixes #5231

Files:

• trunk/wp-includes/plugin.php (modified) (12 diffs)

trunk/wp-includes/plugin.php

@@ -73 +73 @@
-    global $wp_filter, $merged_filters;
-
-
+, 'filter'
-    $wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-    unset( $merged_filters[ $tag ] );
@@ -110 +110 @@
-    global $wp_filter, $merged_filters;
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    if ( !isset($wp_filter[$tag]) )
-        return $value;
-
+    // Sort
+    if ( !isset( $merged_filters[ $tag ] ) ) {
+        reset($wp_filter[$tag]);
+        uksort($wp_filter[$tag], "strnatcasecmp");
+        $merged_filters[ $tag ] = true;
+    }
+
-    reset( $wp_filter[ $tag ] );
-
-    $args = func_get_args();
-
-
+ 
-        foreach( (array) current($wp_filter[$tag]) as $the_ )
-            if ( !is_null($the_['function']) ){
@@ -133 +148 @@
-
-/**
- * Merge the filter functions of a specific filter hook with generic filter functions.
- *
- * It is possible to defined generic filter functions using the filter hook
- * <em>all</e>. These functions are called for every filter tag. This function
- * merges the functions attached to the <em>all</em> hook with the functions
- * of a specific hook defined by <tt>$tag</tt>.
- *
- * Bugged if you hook into 'all' tag, then you <strong>will</strong> lose all priority
- * information. {@link http://trac.wordpress.org/ticket/4715 Bug #4715} for more information.
- *
- * @package WordPress
- * @subpackage Plugin
- * @since 1.5
- * @global array $wp_filter Stores all of the filters
- * @global array $merge_filters Merges the filter hooks using this function.
- *
- * @param string $tag The filter hook of which the functions should be merged.
- */
-function merge_filters($tag) {
-    global $wp_filter, $merged_filters;
-
-    if ( isset($wp_filter['all']) && is_array($wp_filter['all']) )
-        $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");
-    }
-    $merged_filters[ $tag ] = true;
-}
-
-/**
- * Removes a function from a specified filter hook.
- *
@@ -186 +169 @@
- */
-function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-
+, 'filter'
-
-    $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
-
-
-
+
+
+
+
-
-    return $r;
-}
+
-
-/**
@@ -216 +202 @@
- */
-function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
-
-
+
+
+
+
+
+
+
+
-
-/**
@@ -242 +234 @@
- */
-function do_action($tag, $arg = '') {
-filter
+action
-
-    if ( is_array($wp_actions) )
@@ -257 +249 @@
-        $args[] = func_get_arg($a);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        return;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            if ( !is_null($the_['function']) )
-                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
-
-filter
+action
-
-}
@@ -310 +319 @@
- */
-function do_action_ref_array($tag, $args) {
-filter
+action
-
-    if ( !is_array($wp_actions) )
@@ -317 +326 @@
-        $wp_actions[] = $tag;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        return;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            if ( !is_null($the_['function']) )
-                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
-
-filter
+action
-
-}
@@ -351 +377 @@
- */
-function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -460 +495 @@
- * @param string|array $function Used for creating unique id
- * @param int $priority Used in counting how many hooks were applied
+ * @param string $type filter or action
- * @return string Unique ID for usage as array key
- */
- = 10
+, $type
-{
-
+, $wp_action
-
-    // If function then just skip all of the tests and not overwrite the following.
-
+ 
-        return $function;
-    // Object Class Calling
-
-
+
-        $obj_idx = get_class($function[0]).$function[1];
-
-
+
+
+
+
+
-            $function[0]->wp_filter_id = $count;
-            $obj_idx .= $count;
@@ -483 +521 @@
-    }
-    // Static Calling
-
+ 
-        return $function[0].$function[1];
-}