Ticket #21760: 21760.10.patch

src/wp-includes/taxonomy.php

@@ -849 +849 @@
                 'taxonomy'               => $taxonomy,
                 'update_term_meta_cache' => false,
                 'orderby'                => 'none',
+                'suppress_filter'        => true,
         );
 
         switch ( $field ) {
@@ -1012 +1013 @@
  *              a list of WP_Term objects.
  * @since 4.5.0 Changed the function signature so that the `$args` array can be provided as the first parameter.
  *              Introduced 'meta_key' and 'meta_value' parameters. Introduced the ability to order results by metadata.
+ * @since 4.8.0 Introduced 'suppress_filter' parameter.
  *
  * @internal The `$deprecated` parameter is parsed for backward compatibility only.
  *
@@ -1080 +1082 @@
  *                                                conjunction with `$meta_value`.
  *     @type string       $meta_value             Limit terms to those matching a specific metadata value. Usually used
  *                                                in conjunction with `$meta_key`.
+ *     @type bool         $suppress_filter        Whether to suppress the {@see 'get_terms'} filter. Default false.
  * }
  * @param array $deprecated Argument array, when using the legacy function parameter format. If present, this
  *                          parameter will be interpreted as `$args`, and the first function parameter will
@@ -1092 +1095 @@
 
         $term_query = new WP_Term_Query();
 
+        $defaults = array(
+                'suppress_filter' => false,
+        );
+
         /*
          * Legacy argument format ($taxonomy, $args) takes precedence.
          *
@@ -1105 +1112 @@
 
         if ( $do_legacy_args ) {
                 $taxonomies = (array) $args;
-                $args = wp_parse_args( $deprecated );
+                $args = wp_parse_args( $deprecated, $defaults );
                 $args['taxonomy'] = $taxonomies;
         } else {
-                $args = wp_parse_args( $args );
+                $args = wp_parse_args( $args, $defaults );
                 if ( isset( $args['taxonomy'] ) && null !== $args['taxonomy'] ) {
                         $args['taxonomy'] = (array) $args['taxonomy'];
                 }
@@ -1122 +1129 @@
                 }
         }
 
+        // Don't pass suppress_filter to WP_Term_Query.
+        $suppress_filter = $args['suppress_filter'];
+        unset( $args['suppress_filter'] );
+
         $terms = $term_query->query( $args );
 
         // Count queries are not filtered, for legacy reasons.
@@ -1129 +1140 @@
                 return $terms;
         }
 
+        if ( $suppress_filter ) {
+                return $terms;
+        }
+
         /**
          * Filters the found terms.
          *

tests/phpunit/tests/term/getTermBy.php

@@ -192 +192 @@
                 $this->assertSame( $term_id, $found->term_id );
                 $this->assertContains( 'LIMIT 1', $wpdb->last_query );
         }
+
+        /**
+         * @ticket 21760
+         */
+        public function test_prevent_recursion_by_get_terms_filter() {
+                $action = new MockAction();
+
+                add_filter( 'get_terms', array( $action, 'filter' ) );
+                get_term_by( 'name', 'burrito', 'post_tag' );
+                remove_filter( 'get_terms', array( $action, 'filter' ) );
+
+                $this->assertEquals( 0, $action->get_call_count() );
+        }
 }