Changeset 7119 for branches/0.9/bb-includes/wp-functions.php

Timestamp:

08/11/2020 05:48:29 AM (4 years ago)

Author:

xknown

Message:

Sync the _wp_filter_build_unique_id function to rWP38282

File:

• branches/0.9/bb-includes/wp-functions.php (modified) (1 diff)

branches/0.9/bb-includes/wp-functions.php

@@ -884 +884 @@
 endif;
 
-if ( !function_exists('_wp_filter_build_unique_id') ) : // [WP6025]
+if ( !function_exists('_wp_filter_build_unique_id') ) : // [WP38282]
 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.
-    // Static Calling
+    static $filter_id_count = 0;
+
     if( is_string($function) )
         return $function;
 
-    if ( is_object( $function ) ) {
+    if ( is_object( $function ) ) {
         // Closures are currently implemented as objects.
         $function = array( $function, '' );
-    } else {
+    } else {
         $function = (array) $function;
     }
 
-    // Object Class Calling
-    if(is_object($function[0]) )
+    if ( is_object($function[0]) )
     {
+        // Object Class Calling
         if ( function_exists('spl_object_hash') ) {
             return spl_object_hash($function[0]) . $function[1];
         } else {
             $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
+            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]) : $filter_id_count;
+                $function[0]->wp_filter_id = $filter_id_count;
+                ++$filter_id_count;
+            } else {
                 $obj_idx .= $function[0]->wp_filter_id;
+            }
             return $obj_idx;
         }