From c25e29ce9bcc03b1c3fc66a7b870f2ddbf37708b Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Sat, 20 May 2023 03:56:54 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@55828 602fd350-edb4-49c9-b593-d223f7449a82 --- package-lock.json | 46 ++++++++++++------------ package.json | 12 +++---- src/wp-includes/block-template.php | 2 ++ src/wp-includes/blocks/template-part.php | 4 +-- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e794462c7..e714d28ce7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4043,9 +4043,9 @@ } }, "@wordpress/block-directory": { - "version": "4.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-4.3.12.tgz", - "integrity": "sha512-/AKFObqY72//1gNLqUl8Neiq3SzH3kvLV6qjW0TEdhbQgocM7zbqs4X0vnQiIRbW1OAJQS2kSD5bmnmei7dcJQ==", + "version": "4.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-4.3.13.tgz", + "integrity": "sha512-WHLRShrm4+vMUmc1o37f7XMB/mVDJc45aYzeXBH+IpgSxolMI/XecRBIu7Odn9Z1S3KS1Udf7g51HcBZlkPN6A==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.26.1", @@ -4056,7 +4056,7 @@ "@wordpress/compose": "^6.3.3", "@wordpress/core-data": "^6.3.3", "@wordpress/data": "^8.3.3", - "@wordpress/edit-post": "^7.3.12", + "@wordpress/edit-post": "^7.3.13", "@wordpress/editor": "^13.3.10", "@wordpress/element": "^5.3.2", "@wordpress/hooks": "^3.26.1", @@ -4121,9 +4121,9 @@ } }, "@wordpress/block-library": { - "version": "8.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-8.3.12.tgz", - "integrity": "sha512-I42cCDu7fZGsUHqABLW6jH84ZsUg38/2BhxyBLCn3ZIY6eFgHEiCVkD+4aLr/jpEKNWCC+wBaHjlHi5fXMDtdw==", + "version": "8.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-8.3.13.tgz", + "integrity": "sha512-0AXeFuWru0UYRHTamd2i/W4+qabiJz6HF8qn8/trJK4UIaX2anJAjfr4zlqsSzyOEWtqpShk7wzqb5Buj6C0KA==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.26.1", @@ -4343,13 +4343,13 @@ } }, "@wordpress/customize-widgets": { - "version": "4.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-4.3.12.tgz", - "integrity": "sha512-YM3eltvxLwBUPDLPr1ZpzM/oH2biVNj6yfXhLBmxaOxD/8/gquTsDpcdEVl7kDTm/WOA8r73h7HHRhijtSOLgg==", + "version": "4.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-4.3.13.tgz", + "integrity": "sha512-EneYjc4c1r5Tug9ZfE4TKzNclKASFDoBCwlntRk2/JcYvNAKfXEX0L+x+sSqIGxweuNl9NONV9OnWO1HE9Y70g==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/block-editor": "^11.3.10", - "@wordpress/block-library": "^8.3.12", + "@wordpress/block-library": "^8.3.13", "@wordpress/blocks": "^12.3.3", "@wordpress/components": "^23.3.7", "@wordpress/compose": "^6.3.3", @@ -4496,15 +4496,15 @@ } }, "@wordpress/edit-post": { - "version": "7.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-7.3.12.tgz", - "integrity": "sha512-HQTWgFQwo+tEtTv8yQI4+B0xe3k3IZ+i07cM2UlPrA4CPTODjn5lHe4m8Q2RjdKhmznxApNuLSfh7wBT/WIZmA==", + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-7.3.13.tgz", + "integrity": "sha512-yvRCeuw05aa7YBM8kaxcaZBDu+PhsRbksBcfFBuERmITtsxWA5h+ADX/ncJ9rQq/wfdjZ1oW37JvW9EDvl2YzQ==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.26.1", "@wordpress/api-fetch": "^6.23.1", "@wordpress/block-editor": "^11.3.10", - "@wordpress/block-library": "^8.3.12", + "@wordpress/block-library": "^8.3.13", "@wordpress/blocks": "^12.3.3", "@wordpress/components": "^23.3.7", "@wordpress/compose": "^6.3.3", @@ -4535,15 +4535,15 @@ } }, "@wordpress/edit-site": { - "version": "5.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-5.3.12.tgz", - "integrity": "sha512-26O7ktV/JUoEqu+hpZiuoFhzAMrxdz37C5eti3Bt8ujtDwLHBMS+heaOBv/utJ56n6lGNxu/EABOz/gPsnAQiQ==", + "version": "5.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-5.3.13.tgz", + "integrity": "sha512-AsPmGyYTrDXYiA9oLHgTI0KwowMZ2np1nzL3+jW/vOFK52FLpkIbfkDUmISZkooJWKDFnxQ+2MQjbcDeeZewyw==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.26.1", "@wordpress/api-fetch": "^6.23.1", "@wordpress/block-editor": "^11.3.10", - "@wordpress/block-library": "^8.3.12", + "@wordpress/block-library": "^8.3.13", "@wordpress/blocks": "^12.3.3", "@wordpress/components": "^23.3.7", "@wordpress/compose": "^6.3.3", @@ -4581,14 +4581,14 @@ } }, "@wordpress/edit-widgets": { - "version": "5.3.12", - "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-5.3.12.tgz", - "integrity": "sha512-S8+mmI3D0LJ89N2o4PPQILv08Mf2KE/ywdIVGysLPKZiqebQs2YnnY/6vHpY4kHSeNe5/mY/IWlOjyYOfrjgGw==", + "version": "5.3.13", + "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-5.3.13.tgz", + "integrity": "sha512-WZs6+uxMsSf+QRAUOQ55slenYj2zvifetJhgKyug2+s8G/GWWbFCr+MhV3TDf4PkAfU6A6x9uc7ByguD65HQeA==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^6.23.1", "@wordpress/block-editor": "^11.3.10", - "@wordpress/block-library": "^8.3.12", + "@wordpress/block-library": "^8.3.13", "@wordpress/blocks": "^12.3.3", "@wordpress/components": "^23.3.7", "@wordpress/compose": "^6.3.3", diff --git a/package.json b/package.json index 9065b1e9bb..78725c7fe4 100644 --- a/package.json +++ b/package.json @@ -82,24 +82,24 @@ "@wordpress/api-fetch": "6.23.1", "@wordpress/autop": "3.26.1", "@wordpress/blob": "3.26.1", - "@wordpress/block-directory": "4.3.12", + "@wordpress/block-directory": "4.3.13", "@wordpress/block-editor": "11.3.10", - "@wordpress/block-library": "8.3.12", + "@wordpress/block-library": "8.3.13", "@wordpress/block-serialization-default-parser": "4.26.1", "@wordpress/blocks": "12.3.3", "@wordpress/components": "23.3.7", "@wordpress/compose": "6.3.3", "@wordpress/core-data": "6.3.3", - "@wordpress/customize-widgets": "4.3.12", + "@wordpress/customize-widgets": "4.3.13", "@wordpress/data": "8.3.3", "@wordpress/data-controls": "2.26.3", "@wordpress/date": "4.26.2", "@wordpress/deprecated": "3.26.1", "@wordpress/dom": "3.26.1", "@wordpress/dom-ready": "3.26.1", - "@wordpress/edit-post": "7.3.12", - "@wordpress/edit-site": "5.3.12", - "@wordpress/edit-widgets": "5.3.12", + "@wordpress/edit-post": "7.3.13", + "@wordpress/edit-site": "5.3.13", + "@wordpress/edit-widgets": "5.3.13", "@wordpress/editor": "13.3.10", "@wordpress/element": "5.3.2", "@wordpress/escape-html": "2.26.1", diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php index 6da3908203..a65283cbe7 100644 --- a/src/wp-includes/block-template.php +++ b/src/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/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php index b0507e4646..6f41f2a793 100644 --- a/src/wp-includes/blocks/template-part.php +++ b/src/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;