Process template part shortcodes before blocks (#50801)

* Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded * Revert "Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded" This reverts commit 00374e0. * Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded
WordPress · May 20, 2023 · 3dc64ad · 3dc64ad · github-actions · May 20, 2023
1 parent dc3832f
commit 3dc64ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/block-library/src/template-part/index.php b/packages/block-library/src/template-part/index.php
@@ -143,14 +143,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, "template_part_{$area}" );
-	$content = do_shortcode( $content );
 
 	// Handle embeds for block template parts.
 	global $wp_embed;