dev: revert last, and use taxonomy on query_vars

justlevine · justlevine · commit 47fe8abd136d · 2022-12-17T21:55:05.000Z
diff --git a/src/Data/NodeResolver.php b/src/Data/NodeResolver.php
@@ -81,30 +81,10 @@ public function validate_term( \WP_Term $term ) {
 			return null;
 		}
 
-		// Check if an array has a key that starts with a string.
-		$is_same_term = false;
-
-		$taxonomy = $term->taxonomy;
-
-		// Categories and Tags can use a shorthand in the query vars.
-		if ( 'category' === $taxonomy ) {
-			$taxonomy = 'cat';
-		} elseif ( 'post_tag' === $taxonomy ) {
-			$taxonomy = 'tag';
-		}
-
-		foreach ( array_keys( $this->wp->query_vars ) as $key ) {
-			if ( strpos( $key, $taxonomy ) === 0 ) {
-				$is_same_term = true;
-				break;
-			}
-		}
-
-		if ( ! $is_same_term ) {
+		if ( isset( $this->wp->query_vars['taxonomy'] ) && $term->taxonomy !== $this->wp->query_vars['taxonomy'] ) {
 			return null;
 		}
 
-
 		return $term;
 	}
 
@@ -359,11 +339,9 @@ public function parse_request( string $uri, $extra_query_vars = '' ) {
 		 */
 		global $wp_rewrite;
 
-
 		$this->wp->query_vars = [];
 		$post_type_query_vars = [];
 
-
 		if ( is_array( $extra_query_vars ) ) {
 			$this->wp->query_vars = &$extra_query_vars;
 		} elseif ( ! empty( $extra_query_vars ) ) {
@@ -501,7 +479,6 @@ public function parse_request( string $uri, $extra_query_vars = '' ) {
 		 */
 		$this->wp->public_query_vars = apply_filters( 'query_vars', $this->wp->public_query_vars );
 
-
 		foreach ( get_post_types( [ 'show_in_graphql' => true ], 'objects' )  as $post_type => $t ) {
 			/** @var \WP_Post_Type $t */
 			if ( $t->query_var ) {
diff --git a/src/Type/ObjectType/RootQuery.php b/src/Type/ObjectType/RootQuery.php
@@ -923,6 +923,7 @@ public static function register_term_object_fields() {
 									$args['id'],
 									[
 										'nodeType' => 'TermNode',
+										'taxonomy' => $tax_object->name,
 									]
 								);
 							case 'global_id':

Original file line number	Diff line number	Diff line change
`@@ -923,6 +923,7 @@ public static function register_term_object_fields() {`
`923`	`923`	`$args['id'],`
`924`	`924`	`[`
`925`	`925`	`'nodeType' => 'TermNode',`
	`926`	`+ 'taxonomy' => $tax_object->name,`
`926`	`927`	`]`
`927`	`928`	`);`
`928`	`929`	`case 'global_id':`