Ticket #45495: do_blocks.diff

src/wp-includes/blocks.php

@@ -262 +262 @@
  * @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 );
         $output = '';
 
@@ -276 +269 @@
                 $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' );
+        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 );
+        }
+
         return $output;
 }