-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename QueryLoop to PostTemplate and change Query label (#32514)
- Loading branch information
1 parent
aea92e7
commit e3d999a
Showing
24 changed files
with
202 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../block-library/src/query-loop/editor.scss → ...ock-library/src/post-template/editor.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| <?php | ||
| /** | ||
| * Server-side rendering of the `core/post-template` block. | ||
| * | ||
| * @package WordPress | ||
| */ | ||
|
|
||
| /** | ||
| * Renders the `core/post-template` block on the server. | ||
| * | ||
| * @param array $attributes Block attributes. | ||
| * @param string $content Block default content. | ||
| * @param WP_Block $block Block instance. | ||
| * | ||
| * @return string Returns the output of the query, structured using the layout defined by the block's inner blocks. | ||
| */ | ||
| function render_block_core_post_template( $attributes, $content, $block ) { | ||
| $page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page'; | ||
| $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ]; | ||
|
|
||
| $query_args = build_query_vars_from_query_block( $block, $page ); | ||
| // Override the custom query with the global query if needed. | ||
| $use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ); | ||
| if ( $use_global_query ) { | ||
| global $wp_query; | ||
| if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) { | ||
| // Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination. | ||
| unset( $query_args['offset'] ); | ||
| $query_args = wp_parse_args( $wp_query->query_vars, $query_args ); | ||
|
|
||
| if ( empty( $query_args['post_type'] ) && is_singular() ) { | ||
| $query_args['post_type'] = get_post_type( get_the_ID() ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| $query = new WP_Query( $query_args ); | ||
|
|
||
| if ( ! $query->have_posts() ) { | ||
| return ''; | ||
| } | ||
|
|
||
| $classnames = ''; | ||
| if ( isset( $block->context['displayLayout'] ) && isset( $block->context['query'] ) ) { | ||
| if ( isset( $block->context['displayLayout']['type'] ) && 'flex' === $block->context['displayLayout']['type'] ) { | ||
| $classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}"; | ||
| } | ||
| } | ||
|
|
||
| $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); | ||
|
|
||
| $content = ''; | ||
| while ( $query->have_posts() ) { | ||
| $query->the_post(); | ||
| $block_content = ( | ||
| new WP_Block( | ||
| $block->parsed_block, | ||
| array( | ||
| 'postType' => get_post_type(), | ||
| 'postId' => get_the_ID(), | ||
| ) | ||
| ) | ||
| )->render( array( 'dynamic' => false ) ); | ||
| $content .= "<li>{$block_content}</li>"; | ||
| } | ||
|
|
||
| wp_reset_postdata(); | ||
|
|
||
| return sprintf( | ||
| '<ul %1$s>%2$s</ul>', | ||
| $wrapper_attributes, | ||
| $content | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Registers the `core/post-template` block on the server. | ||
| */ | ||
| function register_block_core_post_template() { | ||
| register_block_type_from_metadata( | ||
| __DIR__ . '/post-template', | ||
| array( | ||
| 'render_callback' => 'render_block_core_post_template', | ||
| 'skip_inner_blocks' => true, | ||
| ) | ||
| ); | ||
| } | ||
| add_action( 'init', 'register_block_core_post_template' ); | ||
|
|
||
| /** | ||
| * Renders the legacy `core/query-loop` block on the server. | ||
| * It triggers a developer warning and then calls the renamed | ||
| * block's `render_callback` function output. | ||
| * | ||
| * This can be removed when WordPress 5.9 is released. | ||
| * | ||
| * @param array $attributes Block attributes. | ||
| * @param string $content Block default content. | ||
| * @param WP_Block $block Block instance. | ||
| * | ||
| * @return string Returns the output of the query, structured using the layout defined by the block's inner blocks. | ||
| */ | ||
| function render_legacy_query_loop_block( $attributes, $content, $block ) { | ||
| trigger_error( | ||
| /* translators: %1$s: Block type */ | ||
| sprintf( __( 'Block %1$s has been renamed to Post Template. %1$s will be supported until WordPress version 5.9.', 'gutenberg' ), $block->name ), | ||
| headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE | ||
| ); | ||
| return render_block_core_post_template( $attributes, $content, $block ); | ||
| } | ||
|
|
||
| /** | ||
| * Complements the renaming of `Query Loop` to `Post Template`. | ||
| * This ensures backwards compatibility for any users running the Gutenberg | ||
| * plugin who have used Query Loop prior to its renaming. | ||
| * | ||
| * This can be removed when WordPress 5.9 is released. | ||
| * | ||
| * @see https://github.com/WordPress/gutenberg/pull/32514 | ||
| */ | ||
| function gutenberg_register_legacy_query_loop_block() { | ||
| $registry = WP_Block_Type_Registry::get_instance(); | ||
| if ( $registry->is_registered( 'core/query-loop' ) ) { | ||
| unregister_block_type( 'core/query-loop' ); | ||
| } | ||
| register_block_type( | ||
| 'core/query-loop', | ||
| array( | ||
| 'category' => 'design', | ||
| 'uses_context' => array( | ||
| 'queryId', | ||
| 'query', | ||
| 'queryContext', | ||
| 'displayLayout', | ||
| 'templateSlug', | ||
| ), | ||
| 'supports' => array( | ||
| 'reusable' => false, | ||
| 'html' => false, | ||
| 'align' => true, | ||
| ), | ||
| 'style' => 'wp-block-post-template', | ||
| 'render_callback' => 'render_legacy_query_loop_block', | ||
| 'skip_inner_blocks' => true, | ||
| ) | ||
| ); | ||
| } | ||
| add_action( 'init', 'gutenberg_register_legacy_query_loop_block' ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
...s/block-library/src/query-loop/style.scss → ...lock-library/src/post-template/style.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.