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

Timestamp:

09/27/2024 09:18:46 AM (8 months ago)

Author:

Bernhard Reiter

Message:

Block Hooks: apply_block_hooks_to_content in Patterns, Templates.

In the Patterns registry, use apply_block_hooks_to_content (introduced in [58291]) instead of the WP_Block_Patterns_Registry class's private get_content method. (The latter is removed as part of this changeset.)

In a similar vein, use apply_block_hooks_to_content in the _build_block_template_result_from_file and _build_block_template_result_from_post functions, respectively.

For that to work, apply_block_hooks_to_content is amended to inject the theme attribute into Template Part blocks, even if no hooked blocks are present.

This kind of centralization is required as a preparation for #61902.

Props bernhard-reiter, jonsurrell.
See #61902.

File:

• trunk/src/wp-includes/class-wp-block-patterns-registry.php (modified) (3 diffs)

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

@@ -160 +160 @@
 
     /**
-     * Prepares the content of a block pattern. If hooked blocks are registered, they get injected into the pattern,
-     * when they met the defined criteria.
-     *
-     * @since 6.4.0
-     *
-     * @param array $pattern       Registered pattern properties.
-     * @param array $hooked_blocks The list of hooked blocks.
-     * @return string The content of the block pattern.
-     */
-    private function prepare_content( $pattern, $hooked_blocks ) {
-        $content = $pattern['content'];
-
-        $before_block_visitor = '_inject_theme_attribute_in_template_part_block';
-        $after_block_visitor  = null;
-        if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
-            $before_block_visitor = make_before_block_visitor( $hooked_blocks, $pattern, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-            $after_block_visitor  = make_after_block_visitor( $hooked_blocks, $pattern, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
-        }
-        $blocks  = parse_blocks( $content );
-        $content = traverse_and_serialize_blocks( $blocks, $before_block_visitor, $after_block_visitor );
-
-        return $content;
-    }
-
-    /**
      * Retrieves the content of a registered block pattern.
      *
@@ -222 +197 @@
 
         $pattern            = $this->registered_patterns[ $pattern_name ];
-        $pattern['content'] = $this->get_content( $pattern_name );
-        $pattern['content'] = $this->prepare_content( $pattern, get_hooked_blocks() );
+        $content            = $this->get_content( $pattern_name );
+        $pattern['content'] = apply_block_hooks_to_content(
+            $content,
+            $pattern,
+            'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+        );
 
         return $pattern;
@@ -244 +223 @@
 
         foreach ( $patterns as $index => $pattern ) {
-            $pattern['content']            = $this->get_content( $pattern['name'], $outside_init_only );
-            $patterns[ $index ]['content'] = $this->prepare_content( $pattern, $hooked_blocks );
+            $content                       = $this->get_content( $pattern['name'], $outside_init_only );
+            $patterns[ $index ]['content'] = apply_block_hooks_to_content(
+                $content,
+                $pattern,
+                'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
+            );
         }