Changeset 56329 for trunk/src/wp-includes/block-template-utils.php

Timestamp:

08/01/2023 02:10:08 AM (3 years ago)

Author:

isabel_brison

Message:

Editor: fix duplication in templates list.

Excludes parent template when a child template is defined during template retrieval.

Props oandregal, mukesh27, flixos90, bgardner.
See #57756.

File:

• trunk/src/wp-includes/block-template-utils.php (modified) (4 diffs)

trunk/src/wp-includes/block-template-utils.php

@@ -361 +361 @@
                         }
 
+                        /*
+                         * The child theme items (stylesheet) are processed before the parent theme's (template).
+                         * If a child theme defines a template, prevent the parent template from being added to the list as well.
+                         */
+                        if ( isset( $template_files[ $template_slug ] ) ) {
+                                continue;
+                        }
+
                         $new_template_item = array(
                                 'slug'  => $template_slug,
@@ -371 +379 @@
                                 $candidate = _add_block_template_part_area_info( $new_template_item );
                                 if ( ! isset( $area ) || ( isset( $area ) && $area === $candidate['area'] ) ) {
-                                        $template_files[] = $candidate;
+                                        $template_files[ $template_slug ] = $candidate;
                                 }
                         }
@@ -381 +389 @@
                                         ( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
                                 ) {
-                                        $template_files[] = $candidate;
+                                        $template_files[ $template_slug ] = $candidate;
                                 }
                         }
@@ -387 +395 @@
         }
 
-        return $template_files;
+        return array_values( $template_files );
 }