Changeset 46220 for trunk/src/wp-includes/plugin.php

Timestamp:

09/20/2019 10:33:13 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove workarounds for spl_object_hash().

The spl_object_hash() function was introduced in PHP 5.2.0. As of PHP 5.3, the PHP SPL extension can no longer be disabled, so these workarounds are no longer needed.

Props jrf.
See #48074.

File:

• trunk/src/wp-includes/plugin.php (modified) (1 diff)

trunk/src/wp-includes/plugin.php

@@ -926 +926 @@
     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 ( ! 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;
-        }
+        return spl_object_hash( $function[0] ) . $function[1];
     } elseif ( is_string( $function[0] ) ) {
         // Static Calling