diff --git a/wp-includes/block-patterns/query-standard-posts.php b/wp-includes/block-patterns/query-standard-posts.php
index c05ace98db..c6fde304e7 100644
--- a/wp-includes/block-patterns/query-standard-posts.php
+++ b/wp-includes/block-patterns/query-standard-posts.php
@@ -9,7 +9,7 @@ return array(
'title' => _x( 'Standard', 'Block pattern title' ),
'blockTypes' => array( 'core/query' ),
'categories' => array( 'query' ),
- 'content' => '
+ 'content' => '
diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index dea94f173e..3be427e866 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -955,9 +955,8 @@ function do_blocks( $content ) {
* If do_blocks() needs to remove wpautop() from the `the_content` filter, this re-adds it afterwards,
* for subsequent `the_content` usage.
*
- * @access private
- *
* @since 5.0.0
+ * @access private
*
* @param string $content The post content running through this filter.
* @return string The unmodified content.
@@ -1142,15 +1141,36 @@ function build_query_vars_from_query_block( $block, $page ) {
$query['offset'] = ( $per_page * ( $page - 1 ) ) + $offset;
$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;
+ // 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']['tagIds'] ) ) {
- $term_ids = array_map( 'intval', $block->context['query']['tagIds'] );
- $term_ids = array_filter( $term_ids );
- $query['tag__in'] = $term_ids;
+ 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 (
isset( $block->context['query']['order'] ) &&
diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index a7cd0178b0..941aa25f12 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -337,6 +337,14 @@ function create_initial_rest_routes() {
$controller = new WP_REST_Pattern_Directory_Controller();
$controller->register_routes();
+ // Block Patterns.
+ $controller = new WP_REST_Block_Patterns_Controller();
+ $controller->register_routes();
+
+ // Block Pattern Categories.
+ $controller = new WP_REST_Block_Pattern_Categories_Controller();
+ $controller->register_routes();
+
// Site Health.
$site_health = WP_Site_Health::get_instance();
$controller = new WP_REST_Site_Health_Controller( $site_health );
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php
new file mode 100644
index 0000000000..693bb7514f
--- /dev/null
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php
@@ -0,0 +1,150 @@
+namespace = 'wp/v2';
+ $this->rest_base = 'block-patterns/categories';
+ }
+
+ /**
+ * Registers the routes for the objects of the controller.
+ *
+ * @since 6.0.0
+ */
+ public function register_routes() {
+ register_rest_route(
+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( $this, 'get_items' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
+ ),
+ 'schema' => array( $this, 'get_public_item_schema' ),
+ )
+ );
+ }
+
+ /**
+ * Checks whether a given request has permission to read block patterns.
+ *
+ * @since 6.0.0
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+ */
+ public function get_items_permissions_check( $request ) {
+ if ( current_user_can( 'edit_posts' ) ) {
+ return true;
+ }
+
+ foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+ if ( current_user_can( $post_type->cap->edit_posts ) ) {
+ return true;
+ }
+ }
+
+ return new WP_Error(
+ 'rest_cannot_view',
+ __( 'Sorry, you are not allowed to view the registered block pattern categories.' ),
+ array( 'status' => rest_authorization_required_code() )
+ );
+ }
+
+ /**
+ * Retrieves all block pattern categories.
+ *
+ * @since 6.0.0
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
+ */
+ public function get_items( $request ) {
+ $response = array();
+ $categories = WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered();
+ foreach ( $categories as $category ) {
+ $prepared_category = $this->prepare_item_for_response( $category, $request );
+ $response[] = $this->prepare_response_for_collection( $prepared_category );
+ }
+
+ return rest_ensure_response( $response );
+ }
+
+ /**
+ * Prepare a raw block pattern category before it gets output in a REST API response.
+ *
+ * @since 6.0.0
+ *
+ * @param object $item Raw category as registered, before any changes.
+ * @param WP_REST_Request $request Request object.
+ * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+ */
+ public function prepare_item_for_response( $item, $request ) {
+ $fields = $this->get_fields_for_response( $request );
+ $keys = array( 'name', 'label' );
+ $data = array();
+ foreach ( $keys as $key ) {
+ if ( rest_is_field_included( $key, $fields ) ) {
+ $data[ $key ] = $item[ $key ];
+ }
+ }
+
+ $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+ $data = $this->add_additional_fields_to_object( $data, $request );
+ $data = $this->filter_response_by_context( $data, $context );
+
+ return rest_ensure_response( $data );
+ }
+
+ /**
+ * Retrieves the block pattern category schema, conforming to JSON Schema.
+ *
+ * @since 6.0.0
+ *
+ * @return array Item schema data.
+ */
+ public function get_item_schema() {
+ $schema = array(
+ '$schema' => 'http://json-schema.org/draft-04/schema#',
+ 'title' => 'block-pattern-category',
+ 'type' => 'object',
+ 'properties' => array(
+ 'name' => array(
+ 'description' => __( 'The category name.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'label' => array(
+ 'description' => __( 'The category label, in human readable format.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ ),
+ );
+
+ return $this->add_additional_fields_schema( $schema );
+ }
+}
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php
new file mode 100644
index 0000000000..a96aa9e98d
--- /dev/null
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php
@@ -0,0 +1,198 @@
+namespace = 'wp/v2';
+ $this->rest_base = 'block-patterns/patterns';
+ }
+
+ /**
+ * Registers the routes for the objects of the controller.
+ *
+ * @since 6.0.0
+ */
+ public function register_routes() {
+ register_rest_route(
+ $this->namespace,
+ '/' . $this->rest_base,
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( $this, 'get_items' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
+ ),
+ 'schema' => array( $this, 'get_public_item_schema' ),
+ )
+ );
+ }
+
+ /**
+ * Checks whether a given request has permission to read block patterns.
+ *
+ * @since 6.0.0
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+ */
+ public function get_items_permissions_check( $request ) {
+ if ( current_user_can( 'edit_posts' ) ) {
+ return true;
+ }
+
+ foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+ if ( current_user_can( $post_type->cap->edit_posts ) ) {
+ return true;
+ }
+ }
+
+ return new WP_Error(
+ 'rest_cannot_view',
+ __( 'Sorry, you are not allowed to view the registered block patterns.' ),
+ array( 'status' => rest_authorization_required_code() )
+ );
+ }
+
+ /**
+ * Retrieves all block patterns.
+ *
+ * @since 6.0.0
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+ */
+ public function get_items( $request ) {
+ // Load block patterns from w.org.
+ _load_remote_block_patterns(); // Patterns with the `core` keyword.
+ _load_remote_featured_patterns(); // Patterns in the `featured` category.
+ _register_remote_theme_patterns(); // Patterns requested by current theme.
+
+ $response = array();
+ $patterns = WP_Block_Patterns_Registry::get_instance()->get_all_registered();
+ foreach ( $patterns as $pattern ) {
+ $prepared_pattern = $this->prepare_item_for_response( $pattern, $request );
+ $response[] = $this->prepare_response_for_collection( $prepared_pattern );
+ }
+ return rest_ensure_response( $response );
+ }
+
+ /**
+ * Prepare a raw block pattern before it gets output in a REST API response.
+ *
+ * @since 6.0.0
+ *
+ * @param object $item Raw pattern as registered, before any changes.
+ * @param WP_REST_Request $request Request object.
+ * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+ */
+ public function prepare_item_for_response( $item, $request ) {
+ $fields = $this->get_fields_for_response( $request );
+ $keys = array(
+ 'name',
+ 'title',
+ 'description',
+ 'viewportWidth',
+ 'blockTypes',
+ 'categories',
+ 'keywords',
+ 'content',
+ );
+ $data = array();
+ foreach ( $keys as $key ) {
+ if ( isset( $item[ $key ] ) && rest_is_field_included( $key, $fields ) ) {
+ $data[ $key ] = $item[ $key ];
+ }
+ }
+
+ $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+ $data = $this->add_additional_fields_to_object( $data, $request );
+ $data = $this->filter_response_by_context( $data, $context );
+ return rest_ensure_response( $data );
+ }
+
+ /**
+ * Retrieves the block pattern schema, conforming to JSON Schema.
+ *
+ * @since 6.0.0
+ *
+ * @return array Item schema data.
+ */
+ public function get_item_schema() {
+ $schema = array(
+ '$schema' => 'http://json-schema.org/draft-04/schema#',
+ 'title' => 'block-pattern',
+ 'type' => 'object',
+ 'properties' => array(
+ 'name' => array(
+ 'description' => __( 'The pattern name.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'title' => array(
+ 'description' => __( 'The pattern title, in human readable format.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'description' => array(
+ 'description' => __( 'The pattern detailed description.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'viewportWidth' => array(
+ 'description' => __( 'The pattern viewport width for inserter preview.' ),
+ 'type' => 'number',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'blockTypes' => array(
+ 'description' => __( 'Block types that the pattern is intended to be used with.' ),
+ 'type' => 'array',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'categories' => array(
+ 'description' => __( 'The pattern category slugs.' ),
+ 'type' => 'array',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'keywords' => array(
+ 'description' => __( 'The pattern keywords.' ),
+ 'type' => 'array',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ 'content' => array(
+ 'description' => __( 'The pattern content.' ),
+ 'type' => 'string',
+ 'readonly' => true,
+ 'context' => array( 'view', 'edit', 'embed' ),
+ ),
+ ),
+ );
+
+ return $this->add_additional_fields_schema( $schema );
+ }
+}
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
index 186387d8c0..2deb3c7e7a 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
@@ -80,6 +80,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
* Search and retrieve block patterns metadata
*
* @since 5.8.0
+ * @since 6.0.0 Added 'slug' to request.
*
* @param WP_REST_Request $request Full details about the request.
* @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -100,6 +101,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
$category_id = $request['category'];
$keyword_id = $request['keyword'];
$search_term = $request['search'];
+ $slug = $request['slug'];
if ( $category_id ) {
$query_args['pattern-categories'] = $category_id;
@@ -113,6 +115,10 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
$query_args['search'] = $search_term;
}
+ if ( $slug ) {
+ $query_args['slug'] = $slug;
+ }
+
/*
* Include a hash of the query args, so that different requests are stored in
* separate caches.
@@ -159,7 +165,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
$raw_patterns = new WP_Error(
'pattern_api_failed',
sprintf(
- /* translators: %s: Support forums URL. */
+ /* translators: %s: Support forums URL. */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the
support forums.' ),
__( 'https://wordpress.org/support/forums/' )
),
@@ -255,21 +261,21 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
'description' => __( 'The pattern ID.' ),
'type' => 'integer',
'minimum' => 1,
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'title' => array(
'description' => __( 'The pattern title, in human readable format.' ),
'type' => 'string',
'minLength' => 1,
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'content' => array(
'description' => __( 'The pattern content.' ),
'type' => 'string',
'minLength' => 1,
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'categories' => array(
@@ -277,7 +283,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
'type' => 'array',
'uniqueItems' => true,
'items' => array( 'type' => 'string' ),
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'keywords' => array(
@@ -285,20 +291,20 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
'type' => 'array',
'uniqueItems' => true,
'items' => array( 'type' => 'string' ),
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'description' => array(
'description' => __( 'A description of the pattern.' ),
'type' => 'string',
'minLength' => 1,
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
'viewport_width' => array(
'description' => __( 'The preferred width of the viewport when previewing a pattern, in pixels.' ),
'type' => 'integer',
- 'context' => array( 'view', 'embed' ),
+ 'context' => array( 'view', 'edit', 'embed' ),
),
),
);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 80a6a8c6e0..0f9443b49d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.0-alpha-53151';
+$wp_version = '6.0-alpha-53152';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index c1bab688c0..ffe047b1ec 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -277,6 +277,8 @@ require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-plugins-controller.
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-directory-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-edit-site-export-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php';
+require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-patterns-controller.php';
+require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-application-passwords-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-site-health-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-sidebars-controller.php';