From 5d3e92f90f2172aaa98e42c02c8117d138240b08 Mon Sep 17 00:00:00 2001
From: Pantheon Automation <bot@getpantheon.com>
Date: Sat, 20 May 2023 06:06:23 +0000
Subject: [PATCH] Update to WordPress 6.2.2. For more information, see
 https://wordpress.org/news/2023/05/wordpress-6-2-2-security-release/

---
 wp-admin/about.php                   | 26 ++++++++++++++++++++++++++
 wp-includes/block-template.php       |  2 ++
 wp-includes/blocks/template-part.php |  4 ++--
 wp-includes/version.php              |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index df7f28031b..1c2b654630 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -45,6 +45,32 @@
 		<div class="about__section changelog">
 			<div class="column">
 				<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
+				<p>
+					<?php
+					printf(
+						/* translators: 1: WordPress version number, 2: Plural number of bugs. More than one security issue. */
+						_n(
+							'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+							'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.',
+							1
+						),
+						'6.2.2',
+						'1'
+					);
+					?>
+					<?php
+					printf(
+						/* translators: %s: HelpHub URL. */
+						__( 'For more information, see <a href="%s">the release notes</a>.' ),
+						sprintf(
+							/* translators: %s: WordPress version. */
+							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+							sanitize_title( '6.2.2' )
+						)
+					);
+					?>
+				</p>
+
 				<p>
 					<?php
 					printf(
diff --git a/wp-includes/block-template.php b/wp-includes/block-template.php
index f6b8581e24..4e46f24347 100644
--- a/wp-includes/block-template.php
+++ b/wp-includes/block-template.php
@@ -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 );
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 fb4411f32c..232c597311 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2.1';
+$wp_version = '6.2.2';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.