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

Timestamp:

02/02/2023 07:36:29 PM (4 years ago)

Author:

jorgefilipecosta

Message:

Editor: Remove need for template prefix in get_template_hierarchy.

This commit removes the need to pass a template prefix in get_template_hierarchy.
This is required because, in some block editor usages, the template prefix is not known.

Props youknowriad, davidbaumwald, jorgefilipecosta.
Fixes #57614.

File:

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

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

@@ -1326 +1326 @@
         }
 
+        $matches = array();
+
         $template_hierarchy = array( $slug );
-
         // Most default templates don't have `$template_prefix` assigned.
-        if ( $template_prefix ) {
+        if ( ! empty( $template_prefix ) ) {
                 list( $type ) = explode( '-', $template_prefix );
-                // These checks are needed because the `$slug` above is always added.
+                // We need these checks because we always add the `$slug` above.
                 if ( ! in_array( $template_prefix, array( $slug, $type ), true ) ) {
                         $template_hierarchy[] = $template_prefix;
@@ -1338 +1339 @@
                         $template_hierarchy[] = $type;
                 }
-        }
-
+        } else if ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
+                $template_hierarchy[] = $matches[1];
+        } else if ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
+                $type           = $matches[1];
+                $slug_remaining = $matches[2];
+
+                $items = 'single' === $type ? get_post_types() : get_taxonomies();
+                foreach ( $items as $item ) {
+                        if ( ! str_starts_with( $slug_remaining, $item ) ) {
+                                        continue;
+                        }
+
+                        // If $slug_remaining is equal to $post_type or $taxonomy we have
+                        // the single-$post_type template or the taxonomy-$taxonomy template.
+                        if ( $slug_remaining === $item ) {
+                                $template_hierarchy[] = $type;
+                                break;
+                        }
+
+                        // If $slug_remaining is single-$post_type-$slug template.
+                        if ( strlen( $slug_remaining ) > strlen( $item ) + 1 ) {
+                                $template_hierarchy[] = "$type-$item";
+                                $template_hierarchy[] = $type;
+                                break;
+                        }
+                }
+        }
         // Handle `archive` template.
         if (
@@ -1354 +1380 @@
                 $template_hierarchy[] = 'single';
         }
-
         // Handle `singular` template.
         if (
@@ -1363 +1388 @@
                 $template_hierarchy[] = 'singular';
         }
-
         $template_hierarchy[] = 'index';
-
         return $template_hierarchy;
 }