Ticket #3875: wp-includes.plugin.php.2.diff

plugin.php

@@ -19 +19 @@
         global $wp_filter, $merged_filters;
 
         // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
-        $wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+        $idx = _wp_filter_build_unique_id($tag, $function_to_add, $priority);
+        $wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+        //$wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
         unset( $merged_filters[ $tag ] );
         return true;
 }
@@ -97 +99 @@
  * @return boolean Whether the function is removed.
  */
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-        $function_to_remove = serialize($function_to_remove);
+        $function_to_remove = _wp_filter_build_unique_id($tag, &$function_to_remove, $priority);
 
         $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
 
@@ -280 +282 @@
         add_action('deactivate_' . $file, $function);
 }
 
+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;
+        
+        $fn_idx = '';
+        
+        // Only test if using an array to call a class and method.
+        // Else bypass all of the following checks.
+        if(is_array($function)) 
+        {
+                // Expect most use cases for $obj to be objects and not strings
+                if(is_object($function[0]))
+                {
+                        // We are going to use $classname more than once, store it
+                        $classname = get_class($function[0]);
+                        $fn_idx = $classname.$function[1];
+                        
+                        if(true === array_key_exists('wp_filter_id', get_object_vars($function[0])))
+                        {
+                                $fn_idx .= $function[0]->wp_filter_id;
+                        }
+                        else
+                        {
+                                if(isset($wp_filter[$tag]))
+                                        $i = count($wp_filter[$tag][$priority]);
+                                else
+                                        $i = 0;
+                                $function[0]->wp_filter_id = $i;
+                                $fn_idx .= $function[0]->wp_filter_id;
+                        }
+                }
+                // Must mean that it is using static calling.
+                else 
+                        $fn_idx = $function[0].$function[1];
+        }
+        return $fn_idx;
+}
+
 ?>