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

Fix flash when clicking template name in the editor when a plugin registered template matches a default WP theme template #66359

Merged
merged 4 commits into from
Nov 8, 2024
Merged

Fix flash when clicking template name in the editor when a plugin registered template matches a default WP theme template #66359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
887920c
Fix _gutenberg_get_block_templates_files() so it returns the 'page' t…
Aljullu Oct 23, 2024
f957f64
Try different approach: don't use query to get the templates referenc…
Aljullu Oct 24, 2024
1641d59
Only unset post_type from the query
Aljullu Oct 29, 2024
f1ec716
Add backport file
Aljullu Oct 29, 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
3 changes: 3 additions & 0 deletions backport-changelog/6.7/7676.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
https://github.com/WordPress/wordpress-develop/pull/7676

* https://github.com/WordPress/gutenberg/pull/66359
8 changes: 7 additions & 1 deletion lib/compat/wordpress-6.7/compat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ function _gutenberg_add_block_templates_from_registry( $query_result, $query, $t
}

if ( ! isset( $query['wp_id'] ) ) {
$template_files = _gutenberg_get_block_templates_files( $template_type, $query );
// We need to unset the post_type query param because some templates
// would be excluded otherwise, like `page.html` when looking for
// `page` templates.
// See: https://github.com/WordPress/gutenberg/issues/65584
$template_files_query = $query;
unset( $template_files_query['post_type'] );
$template_files = _gutenberg_get_block_templates_files( $template_type, $template_files_query );

/*
* Add templates registered in the template registry. Filtering out the ones which have a theme file.
Expand Down
Loading