Skip to content

Remove query context leftovers #32093

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

Merged
ntsekouras merged 1 commit into from
May 21, 2021
Merged

Remove query context leftovers #32093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 1 addition & 34 deletions lib/compat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function gutenberg_inject_default_block_context( $args ) {
if ( is_callable( $args['render_callback'] ) ) {
$block_render_callback = $args['render_callback'];
$args['render_callback'] = function( $attributes, $content, $block = null ) use ( $block_render_callback ) {
global $post, $wp_query;
global $post;

// Check for null for back compatibility with WP_Block_Type->render
// which is unused since the introduction of WP_Block class.
Expand Down Expand Up @@ -127,39 +127,6 @@ function gutenberg_inject_default_block_context( $args ) {
$block->context['postType'] = $post->post_type;
}

// Inject the query context if not done by Core.
$needs_query = ! empty( $block_type->uses_context ) && in_array( 'query', $block_type->uses_context, true );
if ( ! isset( $block->context['query'] ) && $needs_query ) {
if ( isset( $wp_query->tax_query->queried_terms['category'] ) ) {
$block->context['query'] = array( 'categoryIds' => array() );

foreach ( $wp_query->tax_query->queried_terms['category']['terms'] as $category_slug_or_id ) {
$block->context['query']['categoryIds'][] = 'slug' === $wp_query->tax_query->queried_terms['category']['field'] ? get_cat_ID( $category_slug_or_id ) : $category_slug_or_id;
}
}

if ( isset( $wp_query->tax_query->queried_terms['post_tag'] ) ) {
if ( isset( $block->context['query'] ) ) {
$block->context['query']['tagIds'] = array();
} else {
$block->context['query'] = array( 'tagIds' => array() );
}

foreach ( $wp_query->tax_query->queried_terms['post_tag']['terms'] as $tag_slug_or_id ) {
$tag_ID = $tag_slug_or_id;

if ( 'slug' === $wp_query->tax_query->queried_terms['post_tag']['field'] ) {
$tag = get_term_by( 'slug', $tag_slug_or_id, 'post_tag' );

if ( $tag ) {
$tag_ID = $tag->term_id;
}
}
$block->context['query']['tagIds'][] = $tag_ID;
}
}
}

return $block_render_callback( $attributes, $content, $block );
};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/query-loop/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function QueryLoopEdit( {
query: {
perPage,
offset,
categoryIds,
categoryIds = [],
postType,
tagIds = [],
order,
Expand Down