Changeset 56960

Timestamp:

10/17/2023 03:46:44 PM (9 months ago)

Author:

Bernhard Reiter

Message:

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 [56896], 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 [56896].
Props mmcalister, swisspidy, thelovelist, hellofromTonya, pbiron, Pauthake015, richtabor, nicolefurlan, huzaifaalmesbah, annezazu, kafleg, aegkr, sunitarai, shresthaaman, andraganescu, onemaggie, gziolo.
Fixes #59629.

Location:

trunk

Files:

• src/wp-includes/block-template-utils.php (modified) (2 diffs)
• src/wp-includes/blocks.php (modified) (1 diff)
• src/wp-includes/class-wp-block-patterns-registry.php (modified) (2 diffs)
• tests/phpunit/tests/block-template-utils.php (modified) (1 diff)
• tests/phpunit/tests/blocks/renderBlockCoreTemplatePart.php (deleted)
• tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php (modified) (2 diffs)

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

@@ -548 +548 @@
     }
 
-    $before_block_visitor = ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ? '_inject_theme_attribute_in_template_part_block' : null;
+    $before_block_visitor = ;
     $after_block_visitor  = null;
     $hooked_blocks        = get_hooked_blocks();
@@ -555 +555 @@
         $after_block_visitor  = make_after_block_visitor( $hooked_blocks, $template );
     }
-    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;
+    $blocks            = parse_blocks( $template_content );
+    $template->content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
 
     return $template;

trunk/src/wp-includes/blocks.php

@@ -780 +780 @@
      */
     return function ( &$block, $parent_block = null, $prev = null ) use ( $hooked_blocks, $context ) {
-        if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-            _inject_theme_attribute_in_template_part_block( $block );
-        }
+        _inject_theme_attribute_in_template_part_block( $block );
 
         $markup = '';

trunk/src/wp-includes/class-wp-block-patterns-registry.php

@@ -166 +166 @@
         $content = $pattern['content'];
 
-        $before_block_visitor = ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ? '_inject_theme_attribute_in_template_part_block' : null;
+        $before_block_visitor = ;
         $after_block_visitor  = null;
         if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
@@ -172 +172 @@
             $after_block_visitor  = make_after_block_visitor( $hooked_blocks, $pattern );
         }
-        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 );
-        }
+        $blocks  = parse_blocks( $content );
+        $content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
 
         return $content;

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

@@ -163 +163 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * @ticket 59338
      *

trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php

@@ -318 +318 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Should insert hooked blocks into registered patterns.
      *
@@ -370 +393 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Should insert hooked blocks into registered patterns.
      *