Changeset 55493

Timestamp:

03/08/2023 10:43:32 PM (3 years ago)

Author:

hellofromTonya

Message:

Site Editor: Revert r54860.

[54860] caused a regression. Changes to a parent theme's template part (i.e.e when a child theme does not override that template part) no longer saved in the Site Editor. Reverting the changeset resolves the regression.

Props mreishus, hellofromTonya, azaozz, ironprogrammer, antonvlasenko.

Fixes #57630.
See #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          = ! empty( $template_file['theme'] ) ? $template_file['theme'] : $theme;
+        $template->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

@@ -120 +120 @@
         }
 
-        /**
-         * 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
-         */
-        public 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 );
-        }
-
         public function test_build_block_template_result_from_file() {
                 $template = _build_block_template_result_from_file(
@@ -175 +156 @@
                 $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
-         */
-        public 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 );
         }