Changeset 49310 for trunk/src/wp-includes/class-wp-block.php

Timestamp:

10/26/2020 08:29:04 AM (5 years ago)

Author:

youknowriad

Message:

Block Editor: Fix WP_Block_Supports class compatibility with Gutenberg-provided class.

When using WordPress trunk with Gutenberg master, there's an incompatibility causing
the dynamic block generated classes to be omitted.
This commit refactors the block supports to fix that problem.

Props nosolosw.
Fixes #51606.

File:

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

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

@@ -193 +193 @@
      */
     public function render( $options = array() ) {
-        global $post, $current_parsed_block;
+        global $post;
         $options = wp_parse_args(
             $options,
@@ -207 +207 @@
             $index = 0;
             foreach ( $this->inner_content as $chunk ) {
-                if ( is_string( $chunk ) ) {
-                    $block_content .= $chunk;
-                } else {
-                    $parent_parsed_block  = $current_parsed_block;
-                    $current_parsed_block = $this->inner_blocks[ $index ]->parsed_block;
-                    $block_content       .= $this->inner_blocks[ $index++ ]->render();
-                    $current_parsed_block = $parent_parsed_block;
-                }
+                $block_content .= is_string( $chunk ) ?
+                    $chunk :
+                    $this->inner_blocks[ $index++ ]->render();
             }
         }
@@ -220 +215 @@
         if ( $is_dynamic ) {
             $global_post   = $post;
+            $parent = WP_Block_Supports::$block_to_render;
+            WP_Block_Supports::$block_to_render = $this->parsed_block;
             $block_content = (string) call_user_func( $this->block_type->render_callback, $this->attributes, $block_content, $this );
+            WP_Block_Supports::$block_to_render = $parent;
             $post          = $global_post;
         }