Skip to content

Update build_query_vars_from_query_block to handle new taxQuery structure #10632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntsekouras wants to merge 7 commits into
base: trunk
Choose a base branch
from
+149 −10
Open

Update build_query_vars_from_query_block to handle new taxQuery structure #10632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26ce245
Update `build_query_vars_from_query_block` to handle new `taxQuery` s…
ntsekouras Dec 15, 2025
27b130e
add the code and tests
ntsekouras Dec 15, 2025
1855dd3
check for empty `taxQuery` key
ntsekouras Dec 15, 2025
40192f7
Update src/wp-includes/blocks.php
ntsekouras Dec 16, 2025
3bebb24
Update src/wp-includes/blocks.php
ntsekouras Dec 17, 2025
293533a
Update src/wp-includes/blocks.php
ntsekouras Dec 18, 2025
b4769ec
Update src/wp-includes/blocks.php
ntsekouras Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 53 additions & 10 deletions src/wp-includes/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,6 +2632,7 @@ function wp_migrate_old_typography_shape( $metadata ) {
* @since 5.8.0
* @since 6.1.0 Added `query_loop_block_query_vars` filter and `parents` support in query.
* @since 6.7.0 Added support for the `format` property in query.
* @since 7.0.0 Updated `taxQuery` structure.
*
* @param WP_Block $block Block instance.
* @param int $page Current query's page.
Expand Down Expand Up @@ -2713,18 +2714,60 @@ function build_query_vars_from_query_block( $block, $page ) {
}
$query['tax_query'] = array_merge( $query['tax_query'], $tax_query_back_compat );
}
if ( ! empty( $block->context['query']['taxQuery'] ) ) {
$tax_query = array();
foreach ( $block->context['query']['taxQuery'] as $taxonomy => $terms ) {
if ( is_taxonomy_viewable( $taxonomy ) && ! empty( $terms ) ) {
$tax_query[] = array(
'taxonomy' => $taxonomy,
'terms' => array_filter( array_map( 'intval', $terms ) ),
'include_children' => false,
);

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' ) ) ) ) {
Copy link
Member

@westonruter westonruter Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically someone could have a taxonomy named include or exclude, no?

Copy link
Author

@ntsekouras ntsekouras Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically yes, but I'd consider it very hard to encounter.. This affects the REST API too and people can't use it properly since there is already the include to limit the result set to specific IDs and the respective exclude arg.

Not sure if we should consider updating register_taxonomy to have some reserved keys or update the REST API to somehow handle these cases, but maybe it's not worth it since it seems quite edge case to have taxonomies with these names? 🤔

foreach ( $block->context['query']['taxQuery'] as $taxonomy => $terms ) {
if ( is_taxonomy_viewable( $taxonomy ) && ! empty( $terms ) ) {
$tax_query[] = array(
'taxonomy' => $taxonomy,
'terms' => array_filter( array_map( 'intval', $terms ) ),
'include_children' => false,
);
}
}
} else {
// This is the new format e.g. "taxQuery":{"include":{"category":[4]},"exclude":{"post_tag":[5]}}

// Helper function to build tax_query conditions from taxonomy terms.
$build_conditions = static function ( $terms, string $operator = 'IN' ): array {
$terms = (array) $terms;
$conditions = array();
foreach ( $terms as $taxonomy => $tax_terms ) {
if ( ! empty( $tax_terms ) && is_taxonomy_viewable( $taxonomy ) ) {
$conditions[] = array(
'taxonomy' => $taxonomy,
'terms' => array_filter( array_map( 'intval', $tax_terms ) ),
'operator' => $operator,
'include_children' => false,
);
}
}
return $conditions;
};

// Separate exclude from include terms.
$exclude_terms = isset( $tax_query_input['exclude'] ) && is_array( $tax_query_input['exclude'] )
? $tax_query_input['exclude']
: array();
$include_terms = isset( $tax_query_input['include'] ) && is_array( $tax_query_input['include'] )
? $tax_query_input['include']
: array();

$tax_query = array_merge(
$build_conditions( $include_terms ),
$build_conditions( $exclude_terms, 'NOT IN' )
);
}

if ( ! empty( $tax_query ) ) {
// Merge with any existing `tax_query` conditions.
$query['tax_query'] = array_merge( $query['tax_query'], $tax_query );
}
$query['tax_query'] = array_merge( $query['tax_query'], $tax_query );
}
if ( ! empty( $block->context['query']['format'] ) && is_array( $block->context['query']['format'] ) ) {
$formats = $block->context['query']['format'];
Expand Down
96 changes: 96 additions & 0 deletions tests/phpunit/tests/blocks/wpBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,102 @@ public function test_build_query_vars_from_query_block() {
);
}

/**
* @ticket 64416
*/
public function test_build_query_vars_from_query_block_tax_query_old_format() {
$this->registry->register(
'core/example',
array( 'uses_context' => array( 'query' ) )
);

$parsed_blocks = parse_blocks( '<!-- wp:example {"ok":true} -->a<!-- wp:example /-->b<!-- /wp:example -->' );
$parsed_block = $parsed_blocks[0];
$context = array(
'query' => array(
'taxQuery' => array(
'category' => array( 1, 2, 3 ),
'post_tag' => array( 10, 20 ),
),
),
);
$block = new WP_Block( $parsed_block, $context, $this->registry );
$query = build_query_vars_from_query_block( $block, 1 );

$this->assertSame(
array(
'post_type' => 'post',
'order' => 'DESC',
'orderby' => 'date',
'post__not_in' => array(),
'tax_query' => array(
array(
'taxonomy' => 'category',
'terms' => array( 1, 2, 3 ),
'include_children' => false,
),
array(
'taxonomy' => 'post_tag',
'terms' => array( 10, 20 ),
'include_children' => false,
),
),
),
$query
);
}

/**
* @ticket 64416
*/
public function test_build_query_vars_from_query_block_tax_query_include_exclude() {
$this->registry->register(
'core/example',
array( 'uses_context' => array( 'query' ) )
);

$parsed_blocks = parse_blocks( '<!-- wp:example {"ok":true} -->a<!-- wp:example /-->b<!-- /wp:example -->' );
$parsed_block = $parsed_blocks[0];
$context = array(
'query' => array(
'taxQuery' => array(
'include' => array(
'category' => array( 1, 2, 3 ),
),
'exclude' => array(
'post_tag' => array( 15 ),
),
),
),
);
$block = new WP_Block( $parsed_block, $context, $this->registry );
$query = build_query_vars_from_query_block( $block, 1 );

$this->assertSame(
array(
'post_type' => 'post',
'order' => 'DESC',
'orderby' => 'date',
'post__not_in' => array(),
'tax_query' => array(
array(
'taxonomy' => 'category',
'terms' => array( 1, 2, 3 ),
'operator' => 'IN',
'include_children' => false,
),
array(
'taxonomy' => 'post_tag',
'terms' => array( 15 ),
'operator' => 'NOT IN',
'include_children' => false,
),
),
),
$query
);
}

/**
* @ticket 62014
*/
Expand Down
Loading