<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56960] trunk: Patterns, Templates: Inject `theme` attr into Template Part blocks.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56960">56960</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56960","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Bernhard Reiter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-17 15:46:44 +0000 (Tue, 17 Oct 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Patterns, Templates: Inject `theme` attr into Template Part blocks.
It was found that Template Part blocks were broken in the Site Editor, showing the `Template part has been deleted or is unavailable` message, due to a missing `theme` attribute.
This bug seems to have been introduced by <a href="https://core.trac.wordpress.org/changeset/56896">[56896]</a>, whose goal was to only inject that attribute into the markup returned by the templates and patterns REST API endpoints but not on the frontend, in order to improve performance. It has been demonstrated locally that reverting that changeset fixes the bug.
Reverts <a href="https://core.trac.wordpress.org/changeset/56896">[56896]</a>.
Props mmcalister, swisspidy, thelovelist, hellofromTonya, pbiron, Pauthake015, richtabor, nicolefurlan, huzaifaalmesbah, annezazu, kafleg, aegkr, sunitarai, shresthaaman, andraganescu, onemaggie, gziolo.
Fixes <a href="https://core.trac.wordpress.org/ticket/59629">#59629</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblockpatternsregistryphp">trunk/src/wp-includes/class-wp-block-patterns-registry.php</a></li>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsblockswpBlockPatternsRegistryphp">trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocksrenderBlockCoreTemplatePartphp">trunk/tests/phpunit/tests/blocks/renderBlockCoreTemplatePart.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template-utils.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/src/wp-includes/block-template-utils.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $template->area = $template_file['area'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before_block_visitor = ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ? '_inject_theme_attribute_in_template_part_block' : null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before_block_visitor = '_inject_theme_attribute_in_template_part_block';
</ins><span class="cx" style="display: block; padding: 0 10px"> $after_block_visitor = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $hooked_blocks = get_hooked_blocks();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,11 +554,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $before_block_visitor = make_before_block_visitor( $hooked_blocks, $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $after_block_visitor = make_after_block_visitor( $hooked_blocks, $template );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null !== $before_block_visitor || null !== $after_block_visitor ) {
- $blocks = parse_blocks( $template_content );
- $template_content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
- }
- $template->content = $template_content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blocks = parse_blocks( $template_content );
+ $template->content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $template;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/src/wp-includes/blocks.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,9 +779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The serialized markup for the given block, with the markup for any hooked blocks prepended to it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return function ( &$block, $parent_block = null, $prev = null ) use ( $hooked_blocks, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
- _inject_theme_attribute_in_template_part_block( $block );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _inject_theme_attribute_in_template_part_block( $block );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $markup = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblockpatternsregistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block-patterns-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-patterns-registry.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/src/wp-includes/class-wp-block-patterns-registry.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,16 +165,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function prepare_content( $pattern, $hooked_blocks ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content = $pattern['content'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $before_block_visitor = ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ? '_inject_theme_attribute_in_template_part_block' : null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $before_block_visitor = '_inject_theme_attribute_in_template_part_block';
</ins><span class="cx" style="display: block; padding: 0 10px"> $after_block_visitor = null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $before_block_visitor = make_before_block_visitor( $hooked_blocks, $pattern );
</span><span class="cx" style="display: block; padding: 0 10px"> $after_block_visitor = make_after_block_visitor( $hooked_blocks, $pattern );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null !== $before_block_visitor || null !== $after_block_visitor ) {
- $blocks = parse_blocks( $content );
- $content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blocks = parse_blocks( $content );
+ $content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template-utils.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,6 +162,64 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 59325
+ *
+ * @covers ::_build_block_template_result_from_file
+ *
+ * @dataProvider data_build_block_template_result_from_file_injects_theme_attribute
+ *
+ * @param string $filename The template's filename.
+ * @param string $expected The expected block markup.
+ */
+ public function test_build_block_template_result_from_file_injects_theme_attribute( $filename, $expected ) {
+ $template = _build_block_template_result_from_file(
+ array(
+ 'slug' => 'single',
+ 'path' => DIR_TESTDATA . "/templates/$filename",
+ ),
+ 'wp_template'
+ );
+ $this->assertSame( $expected, $template->content );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_build_block_template_result_from_file_injects_theme_attribute() {
+ $theme = 'block-theme';
+ return array(
+ 'a template with a template part block' => array(
+ 'filename' => 'template-with-template-part.html',
+ 'expected' => sprintf(
+ '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->',
+ $theme
+ ),
+ ),
+ 'a template with a template part block nested inside another block' => array(
+ 'filename' => 'template-with-nested-template-part.html',
+ 'expected' => sprintf(
+ '<!-- wp:group -->
+<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->
+<!-- /wp:group -->',
+ $theme
+ ),
+ ),
+ 'a template with a template part block with an existing theme attribute' => array(
+ 'filename' => 'template-with-template-part-with-existing-theme-attribute.html',
+ 'expected' => '<!-- wp:template-part {"slug":"header","theme":"fake-theme","align":"full","tagName":"header","className":"site-header"} /-->',
+ ),
+ 'a template with no template part block' => array(
+ 'filename' => 'template.html',
+ 'expected' => '<!-- wp:paragraph -->
+<p>Just a paragraph</p>
+<!-- /wp:paragraph -->',
+ ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 59338
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_inject_theme_attribute_in_template_part_block
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksrenderBlockCoreTemplatePartphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/blocks/renderBlockCoreTemplatePart.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/renderBlockCoreTemplatePart.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/tests/phpunit/tests/blocks/renderBlockCoreTemplatePart.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,121 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Tests for `render_block_core_template_part()`.
- *
- * @package WordPress
- * @subpackage Blocks
- *
- * @group blocks
- */
-class Tests_Blocks_RenderBlockCoreTemplatePart extends WP_UnitTestCase {
-
- /**
- * Temporary storage for original block to render.
- *
- * @var array|null
- */
- private $original_block_to_render = null;
-
- /**
- * Flag to indicate whether to switch back to the default theme at tear down.
- *
- * @var bool
- */
- private $switch_to_default_theme_at_teardown = false;
-
- public function set_up() {
- parent::set_up();
-
- $this->original_block_to_render = WP_Block_Supports::$block_to_render;
- }
-
- public function tear_down() {
- WP_Block_Supports::$block_to_render = $this->original_block_to_render;
- $this->original_block_to_render = null;
-
- if ( $this->switch_to_default_theme_at_teardown ) {
- $this->switch_to_default_theme_at_teardown = false;
- switch_theme( WP_DEFAULT_THEME );
- }
-
- parent::tear_down();
- }
-
- /**
- * Tests that the core template part block assumes the current theme if no theme attribute provided.
- *
- * @ticket 59583
- */
- public function test_render_block_core_template_part_without_theme_attribute() {
- $this->maybe_switch_theme( 'block-theme' );
-
- WP_Block_Supports::$block_to_render = array( 'blockName' => 'core/template-part' );
-
- $content = render_block_core_template_part( array( 'slug' => 'small-header' ) );
-
- $expected = '<header class="wp-block-template-part">' . "\n";
- $expected .= '<p>Small Header Template Part</p>' . "\n";
- $expected .= '</header>';
-
- $this->assertSame( $expected, $content );
- }
-
- /**
- * Tests that the core template part block returns the relevant part if current theme attribute provided.
- *
- * @ticket 59583
- */
- public function test_render_block_core_template_part_with_current_theme_attribute() {
- $this->maybe_switch_theme( 'block-theme' );
-
- WP_Block_Supports::$block_to_render = array( 'blockName' => 'core/template-part' );
-
- $content = render_block_core_template_part(
- array(
- 'slug' => 'small-header',
- 'theme' => 'block-theme',
- )
- );
-
- $expected = '<header class="wp-block-template-part">' . "\n";
- $expected .= '<p>Small Header Template Part</p>' . "\n";
- $expected .= '</header>';
-
- $this->assertSame( $expected, $content );
- }
-
- /**
- * Tests that the core template part block returns nothing if theme attribute for a different theme provided.
- *
- * @ticket 59583
- */
- public function test_render_block_core_template_part_with_another_theme_attribute() {
- $this->maybe_switch_theme( 'block-theme' );
-
- WP_Block_Supports::$block_to_render = array( 'blockName' => 'core/template-part' );
-
- $content = render_block_core_template_part(
- array(
- 'slug' => 'small-header',
- 'theme' => WP_DEFAULT_THEME,
- )
- );
-
- $expected = 'Template part has been deleted or is unavailable: small-header';
- $this->assertSame( $expected, $content );
- }
-
- /**
- * Switches the theme when not the default theme.
- *
- * @param string $theme Theme name to switch to.
- */
- private function maybe_switch_theme( $theme ) {
- if ( WP_DEFAULT_THEME === $theme ) {
- return;
- }
-
- switch_theme( $theme );
- $this->switch_to_default_theme_at_teardown = true;
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsblockswpBlockPatternsRegistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php 2023-10-17 13:48:21 UTC (rev 56959)
+++ trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php 2023-10-17 15:46:44 UTC (rev 56960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,6 +317,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Should insert a theme attribute into Template Part blocks in registered patterns.
+ *
+ * @ticket 59583
+ *
+ * @covers WP_Block_Patterns_Registry::register
+ * @covers WP_Block_Patterns_Registry::get_all_registered
+ */
+ public function test_get_all_registered_includes_theme_attribute() {
+ $test_pattern = array(
+ 'title' => 'Test Pattern',
+ 'content' => '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->',
+ );
+ $this->registry->register( 'test/pattern', $test_pattern );
+
+ $expected = sprintf(
+ '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->',
+ get_stylesheet()
+ );
+ $patterns = $this->registry->get_all_registered();
+ $this->assertSame( $expected, $patterns[0]['content'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Should insert hooked blocks into registered patterns.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 59476
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,6 +392,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Should insert a theme attribute into Template Part blocks in registered patterns.
+ *
+ * @ticket 59583
+ *
+ * @covers WP_Block_Patterns_Registry::register
+ * @covers WP_Block_Patterns_Registry::get_registered
+ */
+ public function test_get_registered_includes_theme_attribute() {
+ $test_pattern = array(
+ 'title' => 'Test Pattern',
+ 'content' => '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->',
+ );
+ $this->registry->register( 'test/pattern', $test_pattern );
+
+ $expected = sprintf(
+ '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->',
+ get_stylesheet()
+ );
+ $pattern = $this->registry->get_registered( 'test/pattern' );
+ $this->assertSame( $expected, $pattern['content'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Should insert hooked blocks into registered patterns.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 59476
</span></span></pre>
</div>
</div>
</body>
</html>