Changeset 53152 for trunk/src/wp-includes/blocks.php

Timestamp:

04/12/2022 09:24:51 AM (2 years ago)

Author:

gziolo

Message:

REST API: Bring new endpoints for Block Patterns from Gutenberg plugin

Related Gutenberg issue: ​https://github.com/WordPress/gutenberg/issues/39889.

Backporting changes from the Gutenberg plugin:

• new Block Patterns REST API endpoint
• new Block Pattern Categories REST API endpoint
• updates to Query Loop related patterns
• support for custom taxonomies in Query Loop block

Props hellofromtonya, peterwilsoncc, ntsekouras, zieladam, ironprogrammer, spacedmonkey, timothyblynjacobs, antonvlasenko, jsnajdr.
See #55505.

File:

• trunk/src/wp-includes/blocks.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -956 +956 @@
  * for subsequent `the_content` usage.
  *
+ * @since 5.0.0
  * @access private
- *
- * @since 5.0.0
  *
  * @param string $content The post content running through this filter.
@@ -1143 +1142 @@
             $query['posts_per_page'] = $per_page;
         }
-        if ( ! empty( $block->context['query']['categoryIds'] ) ) {
-            $term_ids              = array_map( 'intval', $block->context['query']['categoryIds'] );
-            $term_ids              = array_filter( $term_ids );
-            $query['category__in'] = $term_ids;
-        }
-        if ( ! empty( $block->context['query']['tagIds'] ) ) {
-            $term_ids         = array_map( 'intval', $block->context['query']['tagIds'] );
-            $term_ids         = array_filter( $term_ids );
-            $query['tag__in'] = $term_ids;
+        // Migrate `categoryIds` and `tagIds` to `tax_query` for backwards compatibility.
+        if ( ! empty( $block->context['query']['categoryIds'] ) || ! empty( $block->context['query']['tagIds'] ) ) {
+            $tax_query = array();
+            if ( ! empty( $block->context['query']['categoryIds'] ) ) {
+                $tax_query[] = array(
+                    'taxonomy'         => 'category',
+                    'terms'            => array_filter( array_map( 'intval', $block->context['query']['categoryIds'] ) ),
+                    'include_children' => false,
+                );
+            }
+            if ( ! empty( $block->context['query']['tagIds'] ) ) {
+                $tax_query[] = array(
+                    'taxonomy'         => 'post_tag',
+                    'terms'            => array_filter( array_map( 'intval', $block->context['query']['tagIds'] ) ),
+                    'include_children' => false,
+                );
+            }
+            $query['tax_query'] = $tax_query;
+        }
+        if ( ! empty( $block->context['query']['taxQuery'] ) ) {
+            $query['tax_query'] = array();
+            foreach ( $block->context['query']['taxQuery'] as $taxonomy => $terms ) {
+                if ( is_taxonomy_viewable( $taxonomy ) && ! empty( $terms ) ) {
+                    $query['tax_query'][] = array(
+                        'taxonomy'         => $taxonomy,
+                        'terms'            => array_filter( array_map( 'intval', $terms ) ),
+                        'include_children' => false,
+                    );
+                }
+            }
         }
         if (