Changeset 54860

Timestamp:

11/21/2022 04:48:33 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Site Editor: Show correct theme per template or template part.

Child themes inherit templates and template parts from the parent theme. In Site Editor, the "Added by" column for a template defaults to displaying the child theme, even though it is inherited from the parent, creating confusion as to where the actual templates are located.

This commit ensures that the parent theme is correctly displayed in that scenario.

Follow-up to [51003], [52062].

Props ptahdunbar, WoutPitje, petaryoast, costdev, poena, audrasjb, SergeyBiryukov.
Fixes #55437.

Location:

trunk

Files:

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

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

@@ -504 +504 @@
     $template                 = new WP_Block_Template();
     $template->id             = $theme . '//' . $template_file['slug'];
-    $template->theme          = $theme;
+    $template->theme          = ! empty( $template_file['theme'] ) ? $template_file['theme'] : $theme;
     $template->content        = _inject_theme_attribute_in_block_template_content( $template_content );
     $template->slug           = $template_file['slug'];

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

@@ -124 +124 @@
     }
 
+    /**
+     * Tests that _build_block_template_result_from_post() returns the correct theme
+     * for the template when a child theme is active.
+     *
+     * @ticket 55437
+     *
+     * @covers ::_build_block_template_result_from_post
+     */
+    function test_build_block_template_result_from_post_with_child_theme() {
+        switch_theme( 'block-theme-child' );
+
+        $template = _build_block_template_result_from_post(
+            self::$template_post,
+            'wp_template'
+        );
+
+        $this->assertSame( self::TEST_THEME, $template->theme );
+    }
+
     function test_build_block_template_result_from_file() {
         $template = _build_block_template_result_from_file(
@@ -160 +179 @@
         $this->assertSame( 'wp_template_part', $template_part->type );
         $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
+    }
+
+    /**
+     * Tests that _build_block_template_result_from_file() returns the correct theme
+     * for the template when a child theme is active.
+     *
+     * @ticket 55437
+     *
+     * @covers ::_build_block_template_result_from_file
+     */
+    function test_build_block_template_result_from_file_with_child_theme() {
+        switch_theme( 'block-theme-child' );
+
+        $template = _build_block_template_result_from_file(
+            array(
+                'slug'  => 'single',
+                'path'  => __DIR__ . '/../data/templates/template.html',
+                'theme' => self::TEST_THEME,
+            ),
+            'wp_template'
+        );
+
+        $this->assertSame( self::TEST_THEME, $template->theme );
     }