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

Timestamp:

09/15/2022 10:26:28 PM (3 years ago)

Author:

hellofromTonya

Message:

Editor: Fix get_block_templates() to get templates for a post type.

When a post type is passed to get_block_templates() in the query, return only the templates that match that post type.

Fixes an issue where:

• when a block template provided by a theme has been edited by the user
• and that template has specific defined postTypes
• but after editing, the template was available for all post types.

Follow-up to [52062].

Props aljullu, bernhard-reiter, hellofromTonya.
Fixes #55881.

File:

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

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

@@ -553 +553 @@
 
     $theme          = $terms[0]->name;
-    $has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
-        null !== _get_block_template_file( $post->post_type, $post->post_name );
+    $template_file = _get_block_template_file( $post->post_type, $post->post_name );
+    $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
 
     $origin = get_post_meta( $post->ID, 'origin', true );
@@ -574 +574 @@
     $template->author         = $post->post_author;
 
+    if ( 'wp_template' === $post->post_type && $has_theme_file && isset( $template_file['postTypes'] ) ) {
+        $template->post_types = $template_file['postTypes'];
+    }
+
     if ( 'wp_template' === $post->post_type && isset( $default_template_types[ $template->slug ] ) ) {
         $template->is_custom = false;
@@ -673 +677 @@
 
         if ( $post_type && ! $template->is_custom ) {
+            continue;
+        }
+
+        if ( $post_type &&
+            isset( $template->post_types ) &&
+            ! in_array( $post_type, $template->post_types, true )
+        ) {
             continue;
         }