Ticket #21267: 21267.2.diff

tests/phpunit/tests/term/getTerms.php

@@ -190 +190 @@
                 $terms8 = get_terms( 'post_tag', array( 'hide_empty' => false, 'description__like' => '.', 'fields' => 'ids' ) );
                 $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms8 );
         }
+
+        function test_list_terms_exclusions() {
+                $term_id1 = $this->factory->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+
+                add_filter( 'query', array( $this, 'capture_query' ) );
+                add_filter( 'list_terms_exclusions', array( $this, 'capture_exclusions_sql' ) );
+
+                $filter1 = wp_filter_callbacks_hash( 'list_terms_exclusions' );
+
+                $terms1 = get_terms( 'post_tag', array( 'hide_empty' => false, 'exclude' => $term_id1 ) );
+
+                $this->assertNotContains( $term_id1, wp_list_pluck( $terms1, 'term_id' ) );
+                $this->assertNotEquals( false, strpos( $this->sql, 'NOT IN' ) );
+                $this->assertNotEquals( false, strpos( $this->sql, $this->exclude_sql ) );
+
+                add_filter( 'list_terms_exclusions', array( $this, 'filter_list_terms_exclusions' ), 11 );
+
+                $filter2 = wp_filter_callbacks_hash( 'list_terms_exclusions' );
+
+                $this->assertNotEquals( $filter1, $filter2 );
+
+                $terms2 = get_terms( 'post_tag', array( 'hide_empty' => false, 'exclude' => $term_id1 ) );
+
+                $this->assertContains( $term_id1, wp_list_pluck( $terms2, 'term_id' ) );
+                $this->assertFalse( strpos( $this->sql, 'NOT IN' ) );
+                $this->assertFalse( strpos( $this->sql, $this->exclude_sql ) );
+
+                remove_filter( 'query', array( $this, 'capture_query' ) );
+                remove_filter( 'list_terms_exclusions', array( $this, 'capture_exclusions_sql' ) );
+                remove_filter( 'list_terms_exclusions', array( $this, 'filter_list_terms_exclusions' ), 11 );
+        }
+
+        function capture_exclusions_sql( $exclude_sql ) {
+                $this->exclude_sql = $exclude_sql;
+                return $exclude_sql;
+        }
+
+        function filter_list_terms_exclusions() {
+                return '';
+        }
+
+        function capture_query( $sql ) {
+                $this->sql = $sql;
+                return $sql;
+        }
 }

src/wp-includes/plugin.php

@@ -744 +744 @@
 /**
  * Build Unique ID for storage and retrieval.
  *
- * The old way to serialize the callback caused issues and this function is the
- * solution. It works by checking for objects and creating an a new property in
- * the class to keep track of the object and new objects of the same class that
- * need to be added.
- *
- * It also allows for the removal of actions and filters for objects after they
- * change class properties. It is possible to include the property $wp_filter_id
- * in your class and set it to "null" or a number to bypass the workaround.
- * However this will prevent you from adding new classes and any new classes
- * will overwrite the previous hook by the same class.
- *
  * Functions and static method callbacks are just returned as strings and
  * shouldn't have any speed penalty.
  *
@@ -767 +756 @@
  * @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.
  * @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 unique id.
  */
-function _wp_filter_build_unique_id($tag, $function, $priority) {
-        global $wp_filter;
-        static $filter_id_count = 0;
-
-        if ( is_string($function) )
+function _wp_filter_build_unique_id( $tag, $function ) {
+        if ( is_string( $function ) )
                 return $function;
 
-        if ( is_object($function) ) {
-                // Closures are currently implemented as objects
-                $function = array( $function, '' );
-        } else {
-                $function = (array) $function;
-        }
+        if ( is_object( $function ) && 'Closure' === get_class( $function ) )
+                return _wp_build_unique_closure_id( $function );
 
-        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;
-                        }
+        $function = array_filter( (array) $function );
 
-                        return $obj_idx;
-                }
-        } else if ( is_string($function[0]) ) {
+        if ( is_object( $function[0] ) ) {
+                return spl_object_hash( $function[0] ) . '~' . get_class( $function[0] ) . '::' . $function[1];
+        } else if ( is_string( $function[0] ) ) {
                 // Static Calling
-                return $function[0] . '::' . $function[1];
+                return join( '::', $function );
         }
 }
+
+/**
+ * Build Unique ID for Closure
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 3.7
+ *
+ * @param callback $function Used for creating unique id
+ * @return string Unique ID for usage as array key
+ */
+function _wp_build_unique_closure_id( $function ) {
+        ob_start();
+        echo new ReflectionFunction( $function );
+        $source = ob_get_clean();
+        return md5( $source );
+}
+/**
+ * Build Unique ID for list of callbacks
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 3.7
+ *
+ * @param string $tag Name of filter
+ * @return string Unique ID representing hash of filter callback array keys (hashes)
+ */
+function wp_filter_callbacks_hash( $tag ) {
+        global $wp_filter;
+
+        if ( ! has_filter( $tag ) )
+                return '';
+
+        $hashes = array();
+        foreach ( $wp_filter[$tag] as $priority )
+                $hashes = array_merge( $hashes, array_keys( $priority ) );
+
+        return md5( join( '', array_map( '_dehash_filter_callback_object', $hashes ) ) );
+ }
+
+/**
+ * Remove the spl_object_hash portion of the filter callback key
+ * This will allow persistence between requests
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 3.7
+ *
+ * @param string $hash
+ * @return string
+ */
+function _dehash_filter_callback_object( $hash ) {
+        if ( false !== strpos( $hash, '~' ) ) {
+                $bits = explode( '~', $hash, 2 );
+                return $bits[1];
+        }
+        return $hash;
+ }
+ No newline at end of file

src/wp-includes/taxonomy.php

@@ -1305 +1305 @@
         }
 
         // $args can be whatever, only use the args defined in defaults to compute the key
-        $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
-        $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
+        $filter_key = wp_filter_callbacks_hash( 'list_terms_exclusions' );
+        $key = md5( serialize( compact( array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $filter_key ); 
         $last_changed = wp_cache_get( 'last_changed', 'terms' );
         if ( ! $last_changed ) {
                 $last_changed = microtime();