Editor: Restore shortcode support for block templates.

Follow up to [55761].

Props youknowriad, Clorith, desrosj, antpb, Otto42, johnbillion, jorbin, rmccue, timothyblynjacobs, mikeschroder, peterwilsoncc, audrasjb, matveb, noisysocks, xknown, ehtis, isabel_brison, talldanwp, gziolo, chriscct7, davidbaumwald.
Merges [55828] to the 5.9 branch.
See #58333.

git-svn-id: https://develop.svn.wordpress.org/branches/5.9@55832 602fd350-edb4-49c9-b593-d223f7449a82

Author: desrosj

package-lock.json

@@ -84,22 +84,22 @@
 		"@wordpress/blob": "3.2.2",
 		"@wordpress/block-directory": "3.0.30",
 		"@wordpress/block-editor": "8.0.18",
-		"@wordpress/block-library": "6.0.29",
+		"@wordpress/block-library": "6.0.30",
 		"@wordpress/block-serialization-default-parser": "4.2.3",
 		"@wordpress/blocks": "11.1.5",
 		"@wordpress/components": "19.2.3",
 		"@wordpress/compose": "5.0.7",
 		"@wordpress/core-data": "4.0.11",
-		"@wordpress/customize-widgets": "2.0.30",
+		"@wordpress/customize-widgets": "2.0.31",
 		"@wordpress/data": "6.1.5",
 		"@wordpress/data-controls": "2.2.9",
 		"@wordpress/date": "4.2.3",
 		"@wordpress/deprecated": "3.2.3",
 		"@wordpress/dom": "3.2.7",
 		"@wordpress/dom-ready": "3.2.3",
-		"@wordpress/edit-post": "5.0.30",
-		"@wordpress/edit-site": "3.0.30",
-		"@wordpress/edit-widgets": "3.1.25",
+		"@wordpress/edit-post": "5.0.31",
+		"@wordpress/edit-site": "3.0.31",
+		"@wordpress/edit-widgets": "3.1.26",
 		"@wordpress/editor": "12.0.22",
 		"@wordpress/element": "4.0.4",
 		"@wordpress/escape-html": "2.2.3",

package.json

@@ -237,6 +237,8 @@ function get_the_block_template_html() {
 
 	$content = $wp_embed->run_shortcode( $_wp_current_template_content );
 	$content = $wp_embed->autoembed( $content );
+	$content = shortcode_unautop( $content );
+	$content = do_shortcode( $content );
 	$content = do_blocks( $content );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );

src/wp-includes/block-template.php

@@ -128,14 +128,14 @@ function render_block_core_template_part( $attributes ) {
 	}
 
 	// Run through the actions that are typically taken on the_content.
+	$content                       = shortcode_unautop( $content );
+	$content                       = do_shortcode( $content );
 	$seen_ids[ $template_part_id ] = true;
 	$content                       = do_blocks( $content );
 	unset( $seen_ids[ $template_part_id ] );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
-	$content = shortcode_unautop( $content );
 	$content = wp_filter_content_tags( $content );
-	$content = do_shortcode( $content );
 
 	// Handle embeds for block template parts.
 	global $wp_embed;