Reflect latest changes from WordPress/gutenberg#55217.

ockham · Oct 11, 2023 · 4fb3a58 · 4fb3a58
1 parent 62e0be6
commit 4fb3a58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/wp-includes/blocks/pattern.php b/src/wp-includes/blocks/pattern.php
@@ -46,7 +46,6 @@ function render_block_core_pattern( $attributes ) {
 	// Backward compatibility for handling Block Hooks and injecting the theme attribute in the Gutenberg plugin.
 	// This can be removed when the minimum supported WordPress is >= 6.4.
 	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && ! function_exists( 'traverse_and_serialize_blocks' ) ) {
-		$content = _inject_theme_attribute_in_block_template_content( $content );
 		$blocks  = parse_blocks( $content );
 		$content = gutenberg_serialize_blocks( $blocks );
 	}

diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
@@ -18,14 +18,9 @@ function render_block_core_template_part( $attributes ) {
 	$template_part_id = null;
 	$content          = null;
 	$area             = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+	$theme            = isset( $attributes['theme'] ) ? $attributes['theme'] : get_stylesheet();
 
-	if ( isset( $attribues['theme'] ) ) {
-		$theme = $attributes['theme'];
-	} else {
-		$theme = get_stylesheet();
-	}
-
-	if ( isset( $attributes['slug'] ) ) {
+	if ( isset( $attributes['slug'] ) && get_stylesheet() === $theme ) {
 		$template_part_id    = $theme . '//' . $attributes['slug'];
 		$template_part_query = new WP_Query(
 			array(