Ticket #52567: shortcode-p-tag.diff

src/wp-includes/blocks/shortcode.php

@@ -14 +14 @@
  * @return string Returns the block content.
  */
 function render_block_core_shortcode( $attributes, $content ) {
-        return wpautop( $content );
+        return  $content;
 }
 
 /**

src/wp-includes/default-filters.php

@@ -618 +618 @@
 add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
 
 // Shortcodes.
-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop().
+add_filter( 'the_content', 'do_shortcode', 9 ); // AFTER wpautop().
 
 // Media.
 add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );