check for empty taxQuery key

ntsekouras · ntsekouras · commit 1855dd398f8a · 2025-12-15T10:57:21.000+02:00
diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
@@ -2714,9 +2714,10 @@ function build_query_vars_from_query_block( $block, $page ) {
 			}
 			$query['tax_query'] = array_merge( $query['tax_query'], $tax_query_back_compat );
 		}
-		$tax_query_input = $block->context['query']['taxQuery'];
-		if ( ! empty( $tax_query_input ) && is_array( $tax_query_input ) ) {
-			$tax_query = array();
+
+		if ( ! empty( $block->context['query']['taxQuery'] ) && is_array( $block->context['query']['taxQuery'] ) ) {
+			$tax_query_input = $block->context['query']['taxQuery'];
+			$tax_query       = array();
 			// If there are keys other than include/exclude, it's the old
 			// format e.g. "taxQuery":{"category":[4]}
 			if ( ! empty( array_diff( array_keys( $tax_query_input ), array( 'include', 'exclude' ) ) ) ) {

Original file line number	Diff line number	Diff line change
`@@ -2714,9 +2714,10 @@ function build_query_vars_from_query_block( $block, $page ) {`
`2714`	`2714`	`}`
`2715`	`2715`	`$query['tax_query'] = array_merge( $query['tax_query'], $tax_query_back_compat );`
`2716`	`2716`	`}`
`2717`		`- $tax_query_input = $block->context['query']['taxQuery'];`
`2718`		`- if ( ! empty( $tax_query_input ) && is_array( $tax_query_input ) ) {`
`2719`		`- $tax_query = array();`
	`2717`	`+`
	`2718`	`+ if ( ! empty( $block->context['query']['taxQuery'] ) && is_array( $block->context['query']['taxQuery'] ) ) {`
	`2719`	`+ $tax_query_input = $block->context['query']['taxQuery'];`
	`2720`	`+ $tax_query = array();`
`2720`	`2721`	`// If there are keys other than include/exclude, it's the old`
`2721`	`2722`	`// format e.g. "taxQuery":{"category":[4]}`
`2722`	`2723`	`if ( ! empty( array_diff( array_keys( $tax_query_input ), array( 'include', 'exclude' ) ) ) ) {`