From 4cf3fb42bcd6f0162ace8d198de48bcdd5c330dc Mon Sep 17 00:00:00 2001 From: Jb Audras Date: Thu, 15 Sep 2022 11:41:10 +0000 Subject: [PATCH] Editor: Backport `build_query_vars_from_query_block` changes from Gutenberg repository. This changeset backports changes from the following Gutenberg pull requests: - [https://github.com/WordPress/gutenberg/pull/43590 gutenberg#43590] Add a filter to `build_query_vars_from_query_block` - [https://github.com/WordPress/gutenberg/pull/40933 gutenberg#40933] Block Library - Query Loop: Add parents filter Props ntsekouras, bernhard-reiter. See #56467. Built from https://develop.svn.wordpress.org/trunk@54175 git-svn-id: https://core.svn.wordpress.org/trunk@53734 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks.php | 27 ++++++++++++++++++++++++++- wp-includes/version.php | 2 +- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 4600460a76..b18e88d47b 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -1189,6 +1189,7 @@ function wp_migrate_old_typography_shape( $metadata ) { * It's used in Query Loop, Query Pagination Numbers and Query Pagination Next blocks. * * @since 5.8.0 + * @since 6.1.0 Added `query_loop_block_query_vars` filter and `parents` support in query. * * @param WP_Block $block Block instance. * @param int $page Current query's page. @@ -1289,8 +1290,32 @@ function build_query_vars_from_query_block( $block, $page ) { if ( ! empty( $block->context['query']['search'] ) ) { $query['s'] = $block->context['query']['search']; } + if ( ! empty( $block->context['query']['parents'] ) && is_post_type_hierarchical( $query['post_type'] ) ) { + $query['post_parent__in'] = array_filter( array_map( 'intval', $block->context['query']['parents'] ) ); + } } - return $query; + + /** + * Filters the arguments which will be passed to `WP_Query` for the Query Loop Block. + * + * Anything to this filter should be compatible with the `WP_Query` API to form + * the query context which will be passed down to the Query Loop Block's children. + * This can help, for example, to include additional settings or meta queries not + * directly supported by the core Query Loop Block, and extend its capabilities. + * + * Please note that this will only influence the query that will be rendered on the + * front-end. The editor preview is not affected by this filter. Also, worth noting + * that the editor preview uses the REST API, so, ideally, one should aim to provide + * attributes which are also compatible with the REST API, in order to be able to + * implement identical queries on both sides. + * + * @since 6.1.0 + * + * @param array $query Array containing parameters for `WP_Query` as parsed by the block context. + * @param WP_Block $block Block instance. + * @param int $page Current query's page. + */ + return apply_filters( 'query_loop_block_query_vars', $query, $block, $page ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 329838cea4..762060c4fd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-54174'; +$wp_version = '6.1-alpha-54175'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.