From cc435028c603ffe11361582bc6cdc31555c35ab9 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Wed, 20 Jan 2021 12:18:29 +0200 Subject: [PATCH 1/2] Allow the query block to work on singular pages when inheriting the global query --- packages/block-library/src/query-loop/index.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/block-library/src/query-loop/index.php b/packages/block-library/src/query-loop/index.php index 2326898bea28f..784e431493052 100644 --- a/packages/block-library/src/query-loop/index.php +++ b/packages/block-library/src/query-loop/index.php @@ -27,6 +27,10 @@ function render_block_core_query_loop( $attributes, $content, $block ) { // Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination. unset( $query['offset'] ); $query = wp_parse_args( $wp_query->query_vars, $query ); + + if ( '' === $query['post_type'] && is_singular() ) { + $query['post_type'] = get_post_type( get_the_ID() ); + } } } From 7f9874f975d699667839b00626a4840362cbd287 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Wed, 20 Jan 2021 15:18:28 +0200 Subject: [PATCH 2/2] change condition to empty() --- packages/block-library/src/query-loop/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/query-loop/index.php b/packages/block-library/src/query-loop/index.php index 784e431493052..053ebda29a2e2 100644 --- a/packages/block-library/src/query-loop/index.php +++ b/packages/block-library/src/query-loop/index.php @@ -28,7 +28,7 @@ function render_block_core_query_loop( $attributes, $content, $block ) { unset( $query['offset'] ); $query = wp_parse_args( $wp_query->query_vars, $query ); - if ( '' === $query['post_type'] && is_singular() ) { + if ( empty( $query['post_type'] ) && is_singular() ) { $query['post_type'] = get_post_type( get_the_ID() ); } }