From 7b979b35150408289a2221ce06232a7491558307 Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Wed, 8 Mar 2023 22:43:32 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@55493 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/block-template-utils.php | 2 +- tests/phpunit/tests/block-template-utils.php | 42 -------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php index acbb7724c5..39961780e3 100644 --- a/src/wp-includes/block-template-utils.php +++ b/src/wp-includes/block-template-utils.php @@ -503,7 +503,7 @@ function _build_block_template_result_from_file( $template_file, $template_type $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']; $template->source = 'theme'; diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php index 46fa851a37..74b3c21492 100644 --- a/tests/phpunit/tests/block-template-utils.php +++ b/tests/phpunit/tests/block-template-utils.php @@ -119,25 +119,6 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase { $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area ); } - /** - * 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( array( @@ -176,29 +157,6 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase { $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 ); - } - public function test_inject_theme_attribute_in_block_template_content() { $theme = get_stylesheet(); $content_without_theme_attribute = '';