From 2bb3a5169548d16173cf48ca9da1111efc428f86 Mon Sep 17 00:00:00 2001 From: desrosj Date: Sat, 20 May 2023 03:58:47 +0000 Subject: [PATCH] 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. Fixes #58333. Built from https://develop.svn.wordpress.org/trunk@55828 git-svn-id: http://core.svn.wordpress.org/trunk@55340 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-template.php | 2 ++ wp-includes/blocks/template-part.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-includes/block-template.php b/wp-includes/block-template.php index 6da3908203..a65283cbe7 100644 --- a/wp-includes/block-template.php +++ b/wp-includes/block-template.php @@ -236,6 +236,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 ); diff --git a/wp-includes/blocks/template-part.php b/wp-includes/blocks/template-part.php index b0507e4646..6f41f2a793 100644 --- a/wp-includes/blocks/template-part.php +++ b/wp-includes/blocks/template-part.php @@ -142,14 +142,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; diff --git a/wp-includes/version.php b/wp-includes/version.php index 5c083acbb2..299d47f081 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55827'; +$wp_version = '6.3-alpha-55828'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.