Changeset 61650

Timestamp:

02/16/2026 01:11:50 PM (8 weeks ago)

Author:

ntsekouras

Message:

Editor: Update build_query_vars_from_query_block to handle new taxQuery structure.

The Query Loop block's taxQuery attribute now supports an include/exclude structure for term filtering. This updates the server-side query building to handle both the old format (e.g. {"category":[4]}) and the new format (e.g. {"include":{"category":[4]},"exclude":{"post_tag":[5]}}).

Props ntsekouras, westonruter, peterwilsoncc, mcsf.
Fixes #64416.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (2 diffs)
• tests/phpunit/tests/blocks/wpBlock.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -2661 +2661 @@
  * @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.
@@ -2742 +2743 @@
             $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' ) ) ) ) {
+                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,
+                        );
+                    }
                 }
-            }
-            $query['tax_query'] = array_merge( $query['tax_query'], $tax_query );
+            } 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 );
+            }
         }
         if ( ! empty( $block->context['query']['format'] ) && is_array( $block->context['query']['format'] ) ) {

trunk/tests/phpunit/tests/blocks/wpBlock.php

@@ -839 +839 @@
 
     /**
+     * @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
      */