Template Loader: Optimizations.

WordPress · Nov 4, 2019 · 2cc7330 · 2cc7330
1 parent 36a8cf3
commit 2cc7330
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/template-loader.php b/lib/template-loader.php
@@ -109,15 +109,16 @@ function gutenberg_find_template( $template_file ) {
 		$current_template_post = array_shift( $template_posts );
 
 		// Build map of template slugs to their priority in the current hierarchy.
-		$slug_priorities = array();
-		foreach ( $slugs as $index => $slug ) {
-			$slug_priorities[ $slug ] = $index;
-		}
+		$slug_priorities = array_flip( $slugs );
 
 		// See if there is a theme block template with higher priority than the resolved template post.
 		$higher_priority_block_template_path     = null;
 		$higher_priority_block_template_priority = PHP_INT_MAX;
-		foreach ( array_unique( array_merge( glob( get_stylesheet_directory() . '/block-templates/*.html', 1 ), glob( get_template_directory() . '/block-templates/*.html', 1 ) ) ) as $path ) {
+		$block_template_files                    = glob( get_stylesheet_directory() . '/block-templates/*.html', 1 );
+		if ( is_child_theme() ) {
+				$block_template_files = array_merge( $block_template_files, glob( get_template_directory() . '/block-templates/*.html', 1 ) );
+		}
+		foreach ( $block_template_files as $path ) {
 			$theme_block_template_priority = $slug_priorities[ basename( $path, '.html' ) ];
 			if (
 				isset( $theme_block_template_priority ) &&
@@ -131,7 +132,7 @@ function gutenberg_find_template( $template_file ) {
 
 		// If there is, use it instead.
 		if ( isset( $higher_priority_block_template_path ) ) {
-			$post_name                 = basename( $path, '.html' );
+			$post_name             = basename( $path, '.html' );
 			$current_template_post = array(
 				'post_content' => file_get_contents( $higher_priority_block_template_path ),
 				'post_title'   => ucfirst( $post_name ),