Ticket #58366: 58366-poc.2.diff

src/wp-includes/block-template.php

@@ -259 +259 @@
         $content = $wp_embed->run_shortcode( $_wp_current_template_content );
         $content = $wp_embed->autoembed( $content );
         $content = shortcode_unautop( $content );
+        $line_break_placeholder = function( $shortcode_output ) {
+            return str_replace( "\n", '<!-- wp-block-theme-line-break-placeholder -->', $shortcode_output );
+    };
+        add_filter( 'do_shortcode_tag', $line_break_placeholder, 100 );
         $content = do_shortcode( $content );
-
+        remove_filter( 'do_shortcode_tag', $line_break_placeholder, 100 );
         /*
          * Most block themes omit the `core/query` and `core/post-template` blocks in their singular content templates.
          * While this technically still works since singular content templates are always for only one post, it results in
@@ -297 +301 @@
         $content = wptexturize( $content );
         $content = convert_smilies( $content );
         $content = wp_filter_content_tags( $content, 'template' );
+        $content = str_replace( '<!-- wp-block-theme-line-break-placeholder -->', "\n", $content );
         $content = str_replace( ']]>', ']]&gt;', $content );
 
         // Wrap block template in .wp-site-blocks to allow for specific descendant styles

src/wp-includes/blocks/template-part.php

@@ -151 +151 @@
 
         // Run through the actions that are typically taken on the_content.
         $content                       = shortcode_unautop( $content );
+        $line_break_placeholder = function( $shortcode_output ) {
+                return str_replace( "\n", '<!-- wp-block-theme-line-break-placeholder -->', $shortcode_output );
+        };
+        add_filter( 'do_shortcode_tag', $line_break_placeholder, 100 );
         $content                       = do_shortcode( $content );
+        remove_filter( 'do_shortcode_tag', $line_break_placeholder, 100 );
         $seen_ids[ $template_part_id ] = true;
         $content                       = do_blocks( $content );
         unset( $seen_ids[ $template_part_id ] );
         $content = wptexturize( $content );
         $content = convert_smilies( $content );
+        $content = str_replace( '<!-- wp-block-theme-line-break-placeholder -->', "\n", $content );
         $content = wp_filter_content_tags( $content, "template_part_{$area}" );
 
         // Handle embeds for block template parts.