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

Timestamp:

12/13/2018 06:11:10 PM (6 years ago)

Author:

desrosj

Message:

Blocks: Parse blocks when displaying posts.

Posts containing blocks are now correctly handled when displaying on the front end, including dynamic blocks and nested blocks.

Props pento.

Merges [43752] to trunk.

See #45109.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-parser.php (modified) (3 diffs)

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

@@ -311 +311 @@
                  * block and add it as a new innerBlock to the parent
                  */
-                $stack_top                    = array_pop( $this->stack );
-                $stack_top->block->innerHTML .= substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
-                $stack_top->prev_offset       = $start_offset + $token_length;
+                $stack_top = array_pop( $this->stack );
+
+                $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
+                if ( $stack_top->block->innerBlocks ) {
+                    $stack_top->block->innerBlocks[] = (array) $this->freeform( $html );
+                } else {
+                    $stack_top->block->innerHTML = $html;
+                }
+
+                $stack_top->prev_offset = $start_offset + $token_length;
 
                 $this->add_inner_block(
@@ -446 +453 @@
     function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
         $parent                       = $this->stack[ count( $this->stack ) - 1 ];
-        $parent->block->innerBlocks[] = $block;
-        $parent->block->innerHTML    .= substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
+        $parent->block->innerBlocks[] = (array) $this->freeform( substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ) );
+        $parent->block->innerBlocks[] = (array) $block;
         $parent->prev_offset          = $last_offset ? $last_offset : $token_start + $token_length;
     }
@@ -462 +469 @@
         $prev_offset = $stack_top->prev_offset;
 
-        $stack_top->block->innerHTML .= isset( $end_offset )
+        $html = isset( $end_offset )
             ? substr( $this->document, $prev_offset, $end_offset - $prev_offset )
             : substr( $this->document, $prev_offset );
+
+        if ( $stack_top->block->innerBlocks ) {
+            $stack_top->block->innerBlocks[] = (array) $this->freeform( $html );
+        } else {
+            $stack_top->block->innerHTML = $html;
+        }
 
         if ( isset( $stack_top->leading_html_start ) ) {