Index: wp-includes/plugin.php
===================================================================
--- wp-includes/plugin.php	(revision 11635)
+++ wp-includes/plugin.php	(working copy)
@@ -664,35 +664,34 @@
  * @since 2.2.3
  * @link http://trac.wordpress.org/ticket/3875
  *
- * @global array $wp_filter Storage for all of the filters and actions
  * @param string $tag Used in counting how many hooks were applied
  * @param callback $function Used for creating unique id
- * @param int|bool $priority Used in counting how many hooks were applied.  If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
- * @param string $type filter or action
- * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniqe id.
+ * @param mixed $deprecated Optional, not used
+ *
+ * @return string Unique ID for usage as array key
  */
-function _wp_filter_build_unique_id($tag, $function, $priority) {
-	global $wp_filter;
+function _wp_filter_build_unique_id($tag, $function, $deprecated = null) {
 	static $filter_id_count = 0;
 
-	// If function then just skip all of the tests and not overwrite the following.
-	if ( is_string($function) )
+	// Simple Function
+	if ( is_string($function) ) {
 		return $function;
-	// Object Class Calling
-	else if (is_object($function[0]) ) {
-		$obj_idx = get_class($function[0]).$function[1];
-		if ( !isset($function[0]->wp_filter_id) ) {
-			if ( false === $priority )
-				return false;
-			$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : 0;
-			$function[0]->wp_filter_id = $filter_id_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];
+
+	if ( is_array($function) ) {
+		// Object Method
+		if ( is_object($function[0]) ) {
+			if ( !isset($function[0]->wp_filter_id) ) {
+				$function[0]->wp_filter_id = $filter_id_count++;
+			}
+			return get_class($function[0]) . $function[1] . $function[0]->wp_filter_id;
+		}
+
+		// Static Class Method
+		if ( is_string($function[0]) ) {
+			return $function[0] . $function[1];
+		}
+	}
 }
 
 ?>