Ticket #45290: 45290.2.diff

src/wp-includes/blocks.php

@@ -198 +198 @@
  * @return string Updated post content.
  */
 function do_blocks( $content ) {
+        // If there are blocks in this content, we shouldn't run wpautop() on it later.
+        $priority = has_filter( 'the_content', 'wpautop' );
+        if ( false !== $priority && doing_filter( 'the_content' ) && has_blocks( $content ) ) {
+                remove_filter( 'the_content', 'wpautop', $priority );
+                add_filter( 'the_content', '_restore_wpautop_hook', $priority + 1 );
+        }
+
         $blocks = parse_blocks( $content );
         return _recurse_do_blocks( $blocks, $blocks );
 }
 
+/**
+ * If do_blocks() needs to remove wp_autop() from the `the_content` filter, this re-adds it afterwards,
+ * for subsequent `the_content` usage.
+ *
+ * @access private
+ *
+ * @since 5.0.0
+ *
+ * @param string $content The post content running through this filter.
+ * @return string The unmodified content.
+ */
+function _restore_wpautop_hook( $content ) {
+        global $wp_filter;
+        $current_priority = $wp_filter['the_content']->current_priority();
+
+        add_filter( 'the_content', 'wpautop', $current_priority - 1 );
+        remove_filter( 'the_content', '_restore_wpautop_hook', $current_priority );
+
+        return $content;
+}
+
 /**
  * Helper function for do_blocks(), to recurse through the block tree.
  *

src/wp-includes/formatting.php

@@ -442 +442 @@
         if ( trim($pee) === '' )
                 return '';
 
-        // We don't need to autop posts with blocks in them.
-        if ( has_blocks( $pee ) ) {
-                return $pee;
-        }
-
         // Just to make things a little easier, pad the end.
         $pee = $pee . "\n";
 

tests/phpunit/tests/blocks/render.php

@@ -82 +82 @@
                 return $content;
         }
 
+        /**
+         * @ticket 45290
+         */
+        public function test_blocks_arent_autopeed() {
+                $expected_content = 'test';
+                $test_content     = "<!-- wp:fake/block -->\n$expected_content\n<!-- /wp:fake/block -->";
+
+                $current_priority = has_action( 'the_content', 'wpautop' );
+
+                $filtered_content = trim( apply_filters( 'the_content', $test_content ) );
+
+                $this->assertEquals( $expected_content, $filtered_content );
+
+                // Check that wpautop() is still defined in the same place.
+                $this->assertSame( $current_priority, has_action( 'the_content', 'wpautop' ) );
+                // ... and that the restore function has removed itself.
+                $this->assertFalse( has_action( 'the_content', '_restore_wpautop_hook' ) );
+
+                $test_content     = 'test';
+                $expected_content = "<p>$test_content</p>";
+
+                $current_priority = has_action( 'the_content', 'wpautop' );
+
+                $filtered_content = trim( apply_filters( 'the_content', $test_content ) );
+
+                $this->assertEquals( $expected_content, $filtered_content );
+
+                $this->assertSame( $current_priority, has_action( 'the_content', 'wpautop' ) );
+                $this->assertFalse( has_action( 'the_content', '_restore_wpautop_hook' ) );
+        }
+
         /**
          * @ticket 45109
          */