Changeset 6014

Timestamp:

09/03/07 14:59:58 (1 year ago)

Author:

ryan

Message:

Fix how wp_filter array is keyed. Props santosj/darkdragon. fixes #3875 for 2.2

Files:

• branches/2.2/wp-includes/plugin.php (modified) (3 diffs)

branches/2.2/wp-includes/plugin.php

@@ -20 +20 @@
-
-    // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
-serialize($function_to_add
+_wp_filter_build_unique_id($tag, $function_to_add, $priority
-    unset( $merged_filters[ $tag ] );
-    return true;
@@ -99 +99 @@
-function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-    global $wp_filter, $merged_filters;
-
-serialize($function_to_remove
+
+_wp_filter_build_unique_id($tag, $function_to_remove, $priority
-    unset( $merged_filters[ $tag ] );
-
@@ -280 +280 @@
-}
-
+function _wp_filter_build_unique_id($tag, $function, $priority = 10)
+{
+    global $wp_filter;
+    
+    // If function then just skip all of the tests and not overwrite the following.
+    if( is_string($function) )
+        return $function;
+    // Object Class Calling
+    else if(is_object($function[0]) )
+    {
+        $obj_idx = get_class($function[0]).$function[1];
+        if( is_null($function[0]->wp_filter_id) ) {
+            $count = count((array)$wp_filter[$tag][$priority]);
+            $function[0]->wp_filter_id = $count;
+            $obj_idx .= $count;
+            unset($count);
+        } else
+            $obj_idx .= $function[0]->wp_filter_id;
+        return $obj_idx;
+    }
+    // Static Calling
+    else if( is_string($function[0]) )
+        return $function[0].$function[1];
+}
+
-?>