Changeset 56578 for trunk/src/wp-includes/block-template-utils.php

Timestamp:

09/14/2023 08:50:43 AM (19 months ago)

Author:

Bernhard Reiter

Message:

Themes: Inject theme attribute during serialization.

Rather than using _inject_theme_attribute_in_block_template_content to inject the theme attribute into all Template Part blocks found in a given file-based Block Template, introduce a new function called _inject_theme_attribute_in_template_part_block, and use that as second argument to serialize_blocks() (introduced in [56557]) in order to inject said attribute during tree traversal for serialization.

This allows for a more modular approach that will eventually be extended to implement automatic insertion of hooked blocks.

Note that we're guarding _build_block_template_result_from_file() (i.e. the callsite of _inject_theme_attribute_in_template_part_block and previously of _inject_theme_attribute_in_block_template_content) against regressions through additional unit test coverage added in [56562].

Props @gziolo.
Fixes #59338. See #59313.

File:

• trunk/src/wp-includes/block-template-utils.php (modified) (3 diffs)

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

@@ -515 +515 @@
 
 /**
+ * Injects the active theme's stylesheet as a `theme` attribute
+ * into a given template part block.
+ *
+ * @since 6.4.0
+ * @access private
+ *
+ * @param array $block a parsed block.
+ * @return array Updated block.
+ */
+function _inject_theme_attribute_in_template_part_block( $block ) {
+    if (
+        'core/template-part' === $block['blockName'] &&
+        ! isset( $block['attrs']['theme'] )
+    ) {
+        $block['attrs']['theme'] = get_stylesheet();
+    }
+    return $block;
+}
+
+/**
  * Parses a block template and removes the theme attribute from each template part.
  *
@@ -566 +586 @@
     $template->id             = $theme . '//' . $template_file['slug'];
     $template->theme          = $theme;
-    $template->content        = _inject_theme_attribute_in_block_template_content( $template_content );
     $template->slug           = $template_file['slug'];
     $template->source         = 'theme';
@@ -589 +608 @@
         $template->area = $template_file['area'];
     }
+
+    $blocks            = parse_blocks( $template_content );
+    $template->content = serialize_blocks( $blocks, '_inject_theme_attribute_in_template_part_block' );
 
     return $template;