Changeset 45139

Timestamp:

04/08/2019 06:53:14 AM (6 years ago)

Author:

pento

Message:

Blocks: Allow for nested the_content calls within do_blocks().

When do_blocks() is run, it sets up some special handling of the wpautop filter, as we don't want wpautop to run on block content, but we do want it to be available for subsequent runs of the_content, which may be happening on non-block content.

As we set this up before rendering dynamic blocks, however, a dynamic block choosing to run the_content will cause unintentially structural deficiences in this particular recursive block tower.

Moving this handling to after dynamic blocks are rendered makes our tower lean a little less.

Props aldavigdis, pento.
Fixes #45495.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (2 diffs)
• tests/phpunit/tests/blocks/render.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -263 +263 @@
  */
 function do_blocks( $content ) {
+    $blocks = parse_blocks( $content );
+    $output = '';
+
+    foreach ( $blocks as $block ) {
+        $output .= render_block( $block );
+    }
+
     // If there are blocks in this content, we shouldn't run wpautop() on it later.
     $priority = has_filter( 'the_content', 'wpautop' );
@@ -270 +277 @@
     }
 
-    $blocks = parse_blocks( $content );
-    $output = '';
-
-    foreach ( $blocks as $block ) {
-        $output .= render_block( $block );
-    }
-
     return $output;
 }

trunk/tests/phpunit/tests/blocks/render.php

@@ -85 +85 @@
 
     function handle_shortcode( $atts, $content ) {
+        return $content;
+    }
+
+    /**
+     * @ticket 45495
+     */
+    function test_nested_calls_to_the_content() {
+        register_block_type(
+            'core/test',
+            array(
+                'render_callback' => array(
+                    $this,
+                    'dynamic_the_content_call',
+                ),
+            )
+        );
+
+        $content = "foo\n\nbar";
+
+        $the_content = apply_filters( 'the_content', '<!-- wp:core/test -->' . $content . '<!-- /wp:core/test -->' );
+
+        $this->assertSame( $content, $the_content );
+    }
+
+    function dynamic_the_content_call( $attrs, $content ) {
+        apply_filters( 'the_content', '' );
         return $content;
     }