Changeset 58323

Timestamp:

06/04/2024 08:13:01 AM (2 years ago)

Author:

ellatrix

Message:

Editor: Fix block template files query for a post-type.

See ​https://github.com/WordPress/gutenberg/pull/61244.
See ​https://github.com/WordPress/wordpress-develop/pull/6468.

Fixes #61110.

Props mamaduka, mukesh27, grantmkin, vcanales, ellatrix, oandregal.

Location:

trunk

Files:

• src/wp-includes/block-template-utils.php (modified) (2 diffs)
• tests/phpunit/tests/block-template.php (modified) (1 diff)
• tests/phpunit/tests/blocks/getBlockTemplates.php (modified) (4 diffs)

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

@@ -361 +361 @@
         if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) {
                 return null;
+        }
+
+        $default_template_types = array();
+        if ( 'wp_template' === $template_type ) {
+                $default_template_types = get_default_block_template_types();
         }
 
@@ -426 +431 @@
                         if ( 'wp_template' === $template_type ) {
                                 $candidate = _add_block_template_info( $new_template_item );
+                                $is_custom = ! isset( $default_template_types[ $candidate['slug'] ] );
+
                                 if (
                                         ! $post_type ||
                                         ( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
                                 ) {
+                                        $template_files[ $template_slug ] = $candidate;
+                                }
+
+                                // The custom templates with no associated post types are available for all post types.
+                                if ( $post_type && ! isset( $candidate['postTypes'] ) && $is_custom ) {
                                         $template_files[ $template_slug ] = $candidate;
                                 }

trunk/tests/phpunit/tests/block-template.php

@@ -400 +400 @@
                 $templates = array(
                         'parts/small-header.html',
+                        'templates/custom-hero-template.html',
                         'templates/custom-single-post-template.html',
                         'templates/index.html',

trunk/tests/phpunit/tests/blocks/getBlockTemplates.php

@@ -189 +189 @@
          * @dataProvider data_get_block_templates_should_respect_posttypes_property
          * @ticket 55881
+         * @ticket 61110
          *
          * @param string $post_type Post type for query.
@@ -204 +205 @@
         /**
          * Data provider.
+         *
+         * The `custom-hero-template` is intentionally omitted from the theme.json's `customTemplates`.
+         * See: https://core.trac.wordpress.org/ticket/61110.
          *
          * @return array
@@ -212 +216 @@
                                 'post_type' => 'post',
                                 'expected'  => array(
+                                        'block-theme//custom-hero-template',
                                         'block-theme//custom-single-post-template',
                                 ),
@@ -218 +223 @@
                                 'post_type' => 'page',
                                 'expected'  => array(
+                                        'block-theme//custom-hero-template',
                                         'block-theme//page-home',
                                 ),