Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent query block from looping in classic themes #43221

Merged
merged 2 commits into from
Aug 19, 2022
Merged

Prevent query block from looping in classic themes #43221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
674b49e
clone the global WP_Query inside the query loop block
draganescu Aug 15, 2022
78a0eb4
always reset post data after query loop
draganescu Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/block-library/src/post-template/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function render_block_core_post_template( $attributes, $content, $block ) {
$use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
if ( $use_global_query ) {
global $wp_query;
$query = $wp_query;
$query = clone $wp_query;
} else {
$query_args = build_query_vars_from_query_block( $block, $page );
$query = new WP_Query( $query_args );
Expand Down Expand Up @@ -99,9 +99,12 @@ function render_block_core_post_template( $attributes, $content, $block ) {
$content .= '<li class="' . esc_attr( $post_classes ) . '">' . $block_content . '</li>';
}

if ( ! $use_global_query ) {
wp_reset_postdata();
}
/*
* Use this function to restore the context of the template tags
* from a secondary query loop back to the main query loop.
* Since we use two custom loops, it's safest to always restore.
*/
wp_reset_postdata();

return sprintf(
'<ul %1$s>%2$s</ul>',
Expand Down