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

Templates: only resolve patterns for REST API endpoints #61757

Merged
merged 2 commits into from
May 29, 2024
Merged

Templates: only resolve patterns for REST API endpoints #61757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
254d99d
Patterns: only resolve patterns for REST API endpoints
ellatrix May 17, 2024
cdb7dbd
Add changelog entry
ellatrix May 20, 2024
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
6 changes: 6 additions & 0 deletions backport-changelog/6.6/6559.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
https://github.com/WordPress/wordpress-develop/pull/6559

* https://github.com/WordPress/gutenberg/pull/60349
* https://github.com/WordPress/gutenberg/pull/60464
* https://github.com/WordPress/gutenberg/pull/60491
* https://github.com/WordPress/gutenberg/pull/61757
10 changes: 10 additions & 0 deletions lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,14 @@ public function get_template_fallback( $request ) {

return rest_ensure_response( $response );
}

/**
* See WP_REST_Templates_Controller::prepare_item_for_response
*/
public function prepare_item_for_response( $item, $request ) {
$blocks = parse_blocks( $item->content );
$blocks = gutenberg_replace_pattern_blocks( $blocks );
$item->content = serialize_blocks( $blocks );
return parent::prepare_item_for_response( $item, $request );
}
}
23 changes: 0 additions & 23 deletions lib/compat/wordpress-6.6/resolve-patterns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,6 @@ function gutenberg_replace_pattern_blocks( $blocks, &$inner_content = null ) {
return $blocks;
}

function gutenberg_replace_pattern_blocks_get_block_templates( $templates ) {
foreach ( $templates as $template ) {
$blocks = parse_blocks( $template->content );
$blocks = gutenberg_replace_pattern_blocks( $blocks );
$template->content = serialize_blocks( $blocks );
}
return $templates;
}

function gutenberg_replace_pattern_blocks_get_block_template( $template ) {
if ( null === $template ) {
return $template;
}
$blocks = parse_blocks( $template->content );
$blocks = gutenberg_replace_pattern_blocks( $blocks );
$template->content = serialize_blocks( $blocks );
return $template;
}

function gutenberg_replace_pattern_blocks_patterns_endpoint( $result, $server, $request ) {
if ( $request->get_route() !== '/wp/v2/block-patterns/patterns' ) {
return $result;
Expand All @@ -98,10 +79,6 @@ function gutenberg_replace_pattern_blocks_patterns_endpoint( $result, $server, $
return $result;
}

// For core merge, we should avoid the double parse and replace the patterns in templates here:
// https://github.com/WordPress/wordpress-develop/blob/02fb53498f1ce7e63d807b9bafc47a7dba19d169/src/wp-includes/block-template-utils.php#L558
add_filter( 'get_block_templates', 'gutenberg_replace_pattern_blocks_get_block_templates' );
add_filter( 'get_block_template', 'gutenberg_replace_pattern_blocks_get_block_template' );
// Similarly, for patterns, we can avoid the double parse here:
// https://github.com/WordPress/wordpress-develop/blob/02fb53498f1ce7e63d807b9bafc47a7dba19d169/src/wp-includes/class-wp-block-patterns-registry.php#L175
add_filter( 'rest_post_dispatch', 'gutenberg_replace_pattern_blocks_patterns_endpoint', 10, 3 );
Loading