Changeset 37634

Timestamp:

06/04/2016 12:19:15 PM (9 years ago)

Author:

boonebgorges

Message:

Taxonomy: No, really, don't pass results of 'count' query through 'get_terms' filter.

[37623] used the wrong parameter name (count=true instead of fields=count).

For greater flexibility and forward compatibility with other potential changes
to the return value of get_terms(), we now do a looser check: any non-array
value is excluded from the filter.

Fixes #36992.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1210 +1210 @@
 
     // Count queries are not filtered, for legacy reasons.
-    if ( $term_query->query_vars['count'] ) {
+    if ( ! is_array( $terms ) ) {
         return $terms;
     }

trunk/tests/phpunit/tests/term/getTerms.php

@@ -2184 +2184 @@
      * @ticket 35381
      */
-    public function test_count_should_pass_through_main_get_terms_filter() {
+    public function test_count_should_not_pass_through_main_get_terms_filter() {
         add_filter( 'get_terms', array( __CLASS__, 'maybe_filter_count' ) );
 
         $found = get_terms( array(
             'hide_empty' => 0,
-            'count' => true,
+            'fields' => 'count',
         ) );