Change the prefix for custom templates (#30467)

* Change the prefix for custom templates * Update comment
WordPress · Apr 2, 2021 · 5e58e00 · 5e58e00
1 parent 91b24b6
commit 5e58e00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/full-site-editing/template-loader.php b/lib/full-site-editing/template-loader.php
@@ -72,7 +72,9 @@ function gutenberg_override_query_template( $template, $type, array $templates =
 		$template_item_slug = gutenberg_strip_php_suffix( $template_item );
 
 		// Is this a custom template?
-		$is_custom_template = 0 === strpos( $current_block_template_slug, 'custom-template-' );
+		// This check should be removed when merged in core.
+		// Instead, wp_templates should be considered valid in locate_template.
+		$is_custom_template = 0 === strpos( $current_block_template_slug, 'wp-custom-template-' );
 
 		// Don't override the template if we find a template matching the slug we look for
 		// and which does not match a block template slug.

diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
@@ -448,7 +448,7 @@ export function* __unstableSwitchToEditingMode( shouldCreateTemplate = false ) {
 			createBlock( 'core/post-content' ),
 		];
 		const template = {
-			slug: 'custom-template-' + uuid(),
+			slug: 'wp-custom-template-' + uuid(),
 			content: serialize( templateContent ),
 			title: 'Custom Template',
 		};