Ticket #44388: 44388.patch

src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

@@ -159 +159 @@
          */
         public function get_items( $request ) {
 
+                // Check for taxonomy param.
+                $taxonomy = isset( $request['taxonomy'] ) ? $request['taxonomy'] : $this->taxonomy;
+
+                $taxonomy_obj = get_taxonomy( $taxonomy );
+
+                if ( false === $taxonomy_obj ) {
+                        return new WP_Error( 'invalid-taxonomy', sprintf( __( "Invalid '%s' taxonomy" ), $taxonomy ), array( 'status' => 405 ) );
+                }
+
+                $this->taxonomy = $taxonomy;
+
                 // Retrieve the list of registered collection query parameters.
                 $registered = $this->get_collection_params();
 
@@ -208 +219 @@
                         $prepared_args['offset'] = ( $request['page'] - 1 ) * $prepared_args['number'];
                 }
 
-                $taxonomy_obj = get_taxonomy( $this->taxonomy );
-
                 if ( $taxonomy_obj->hierarchical && isset( $registered['parent'], $request['parent'] ) ) {
                         if ( 0 === $request['parent'] ) {
                                 // Only query top-level terms.
@@ -985 +994 @@
                         ),
                 );
 
+                $query_params['taxonomy'] = array(
+                        'description' => __( 'Taxonomy.' ),
+                        'type'        => 'string',
+                        'default'     => null,
+                );
+
                 /**
                  * Filter collection parameters for the terms controller.
                  *

tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -91 +91 @@
                                 'post',
                                 'search',
                                 'slug',
+                                'taxonomy',
                         ), $keys
                 );
         }