WordPress.org

Make WordPress Core

Ticket #10535: 10535.7.patch

File 10535.7.patch, 4.7 KB (added by hakre, 9 years ago)

is_callable() can check for syntax as well and returns the needed string at once - handy.

  • wp-includes/plugin.php

     
    703703/**
    704704 * Build Unique ID for storage and retrieval.
    705705 *
    706  * The old way to serialize the callback caused issues and this function is the
    707  * solution. It works by checking for objects and creating an a new property in
    708  * the class to keep track of the object and new objects of the same class that
    709  * need to be added.
    710  *
     706 * Every hook callback needs to have a Unique ID to identify it within the
     707 * hook registry, the global array $wp_filter.
     708 *
    711709 * It also allows for the removal of actions and filters for objects after they
    712  * change class properties. It is possible to include the property $wp_filter_id
    713  * in your class and set it to "null" or a number to bypass the workaround.
    714  * However this will prevent you from adding new classes and any new classes
    715  * will overwrite the previous hook by the same class.
     710 * change class properties.
    716711 *
    717712 * Functions and static method callbacks are just returned as strings and
    718713 * shouldn't have any speed penalty.
    719714 *
     715 * PHP 5.3 anonymous functions are supported as well.
     716 *
    720717 * @package WordPress
    721718 * @subpackage Plugin
    722719 * @access private
     
    724721 * @link http://trac.wordpress.org/ticket/3875
    725722 *
    726723 * @global array $wp_filter Storage for all of the filters and actions
    727  * @param string $tag Used in counting how many hooks were applied
    728  * @param callback $function Used for creating unique id
    729  * @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.
    730  * @param string $type filter or action
    731  * @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.
     724 * @param string $tag Obsolete, kept for backwards compability.
     725 * @param callback $function Callback to create Unique ID of.
     726 * @param int|bool $priority Obsolete, kept for backwards compability.
     727 * @return string|bool Unique ID (string), or false on failure
    732728 */
    733729function _wp_filter_build_unique_id($tag, $function, $priority) {
    734         global $wp_filter;
    735         static $filter_id_count = 0;
    736730
    737         if ( is_string($function) )
     731        // Ensure that this is in a callable syntax
     732        if ( false === is_callable( $function, true, $callable_name ) )
     733                return false;
     734
     735        // Global function hook or anonymous create_function()-hook.
     736        if ( is_string( $function ) )
    738737                return $function;
    739738
    740         if ( is_object($function) ) {
    741                 // Closures are currently implemented as objects
    742                 $function = array( $function, '' );
    743         } else {
    744                 $function = (array) $function;
     739        // Closures are currently implemented as objects
     740        is_object( $function ) && $function = array( $function, '' );
     741       
     742        // Object Instance / Closure Hook
     743        if ( is_object( $function[0] ) && $object_id = wp_object_hash( $function[0] ) )
     744                return $object_id . '->' . $function[1];
     745
     746        // Static Class Hook
     747        return $callable_name;
     748}
     749
     750/**
     751 * get object hash
     752 *
     753 * Returns a unique hash per object.
     754 *
     755 * Proxy function for wordpress installments on servers
     756 * with a PHP version < 5.2.0.
     757 *
     758 * @since 3.0.2
     759 * @note Become deprecated with version 3.2.0 (PHP 5.2 requirements)
     760 * @param object $object
     761 * @return string unique object hash
     762 */
     763function wp_object_hash( &$object ) {
     764        static $prefix, $count = 0, $property = '__wphookobjhash__';
     765
     766        if ( !is_object( $object ) ) {
     767                trigger_error( __FUNCTION__ . '() expects parameter 1 to be object', E_USER_WARNING );
     768                return null;
    745769        }
    746770
    747         if (is_object($function[0]) ) {
    748                 // Object Class Calling
    749                 if ( function_exists('spl_object_hash') ) {
    750                         return spl_object_hash($function[0]) . $function[1];
    751                 } else {
    752                         $obj_idx = get_class($function[0]).$function[1];
    753                         if ( !isset($function[0]->wp_filter_id) ) {
    754                                 if ( false === $priority )
    755                                         return false;
    756                                 $obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
    757                                 $function[0]->wp_filter_id = $filter_id_count;
    758                                 ++$filter_id_count;
    759                         } else {
    760                                 $obj_idx .= $function[0]->wp_filter_id;
    761                         }
     771        // prefer spl_object_hash if available
     772        if ( function_exists( 'spl_object_hash' ) )
     773                return spl_object_hash( $object );
    762774
    763                         return $obj_idx;
    764                 }
    765         } else if ( is_string($function[0]) ) {
    766                 // Static Calling
    767                 return $function[0].$function[1];
    768         }
     775        // create object hash on our own
     776        isset( $prefix ) || ( ( $prefix = uniqid( '' ) ) && $property .= $prefix . '__' );
     777        isset( $object->$property ) || ( $object->$property = sprintf( '%s-%08d', $prefix , ++$count ) );
     778
     779        return $object->$property;
    769780}
    770781
    771782?>