Changeset 59543

Timestamp:

12/19/2024 01:24:22 PM (3 months ago)

Author:

Bernhard Reiter

Message:

Block Hooks: Apply to synced patterns.

Apply Block Hooks to synced patterns (i.e. core/block instances).

Props bernhard-reiter, gziolo.
Fixes #62704.

Location:

trunk/src/wp-includes

Files:

• blocks.php (modified) (4 diffs)
• default-filters.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -1220 +1220 @@
     if ( 'wp_navigation' === $post->post_type ) {
         $wrapper_block_type = 'core/navigation';
+    } elseif ( 'wp_block' === $post->post_type ) {
+        $wrapper_block_type = 'core/block';
     } else {
         $wrapper_block_type = 'core/post-content';
@@ -1292 +1294 @@
  */
 function insert_hooked_blocks_into_rest_response( $response, $post ) {
-    if ( empty( $response->data['content']['raw'] ) || empty( $response->data['content']['rendered'] ) ) {
+    if ( empty( $response->data['content']['raw'] ) ) {
         return $response;
     }
@@ -1307 +1309 @@
     if ( 'wp_navigation' === $post->post_type ) {
         $wrapper_block_type = 'core/navigation';
+    } elseif ( 'wp_block' === $post->post_type ) {
+        $wrapper_block_type = 'core/block';
     } else {
         $wrapper_block_type = 'core/post-content';
@@ -1327 +1331 @@
 
     $response->data['content']['raw'] = $content;
+
+    // If the rendered content was previously empty, we leave it like that.
+    if ( empty( $response->data['content']['rendered'] ) ) {
+        return $response;
+    }
 
     // `apply_block_hooks_to_content` is called above. Ensure it is not called again as a filter.

trunk/src/wp-includes/default-filters.php

@@ -761 +761 @@
 add_filter( 'rest_pre_insert_wp_template_part', 'inject_ignored_hooked_blocks_metadata_attributes' );
 
-// Update ignoredHookedBlocks postmeta for wp_navigation post type.
+// Update ignoredHookedBlocks postmeta for some post types.
 add_filter( 'rest_pre_insert_page', 'update_ignored_hooked_blocks_postmeta' );
 add_filter( 'rest_pre_insert_post', 'update_ignored_hooked_blocks_postmeta' );
+add_filter( 'rest_pre_insert_wp_block', 'update_ignored_hooked_blocks_postmeta' );
 add_filter( 'rest_pre_insert_wp_navigation', 'update_ignored_hooked_blocks_postmeta' );
 
@@ -769 +770 @@
 add_filter( 'rest_prepare_page', 'insert_hooked_blocks_into_rest_response', 10, 2 );
 add_filter( 'rest_prepare_post', 'insert_hooked_blocks_into_rest_response', 10, 2 );
+add_filter( 'rest_prepare_wp_block', 'insert_hooked_blocks_into_rest_response', 10, 2 );
 add_filter( 'rest_prepare_wp_navigation', 'insert_hooked_blocks_into_rest_response', 10, 2 );