Use cleaned slug to query for template part post (#25030)

Fixes issues where theme template parts were not resolved from subdirectories.
WordPress · Sep 3, 2020 · b1c8026 · b1c8026
1 parent a3cd345
commit b1c8026
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/template-loader.php b/lib/template-loader.php
@@ -148,7 +148,7 @@ function create_auto_draft_for_template_part_block( $block ) {
 				array(
 					'post_type'      => 'wp_template_part',
 					'post_status'    => array( 'publish', 'auto-draft' ),
-					'name'           => $block['attrs']['slug'],
+					'title'          => $block['attrs']['slug'],
 					'meta_key'       => 'theme',
 					'meta_value'     => $block['attrs']['theme'],
 					'posts_per_page' => 1,

diff --git a/packages/block-library/src/template-part/edit/use-template-part-post.js b/packages/block-library/src/template-part/edit/use-template-part-post.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
+import { cleanForSlug } from '@wordpress/url';
 
 export default function useTemplatePartPost( postId, slug, theme ) {
 	return useSelect(
@@ -22,18 +23,19 @@ export default function useTemplatePartPost( postId, slug, theme ) {
 			// load the auto-draft created from the
 			// relevant file.
 			if ( slug && theme ) {
+				const cleanedSlug = cleanForSlug( slug );
 				const posts = select( 'core' ).getEntityRecords(
 					'postType',
 					'wp_template_part',
 					{
 						status: [ 'publish', 'auto-draft' ],
-						slug,
+						slug: cleanedSlug,
 						theme,
 					}
 				);
 				const foundPosts = posts?.filter(
 					( post ) =>
-						post.slug === slug &&
+						post.slug === cleanedSlug &&
 						post.meta &&
 						post.meta.theme === theme
 				);