From f3999b52d882ace95d4472e8de606db23958c9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor?= <27339341+priethor@users.noreply.github.com>
Date: Sat, 20 May 2023 03:35:03 +0200
Subject: [PATCH] Fix wrong conflict resolution when cherry picking

---
 packages/block-library/src/template-part/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/template-part/index.php b/packages/block-library/src/template-part/index.php
index 16a5be0202152..84c9dadb7493c 100644
--- a/packages/block-library/src/template-part/index.php
+++ b/packages/block-library/src/template-part/index.php
@@ -135,7 +135,7 @@ function render_block_core_template_part( $attributes ) {
 	unset( $seen_ids[ $template_part_id ] );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
-	$content = wp_filter_content_tags( $content, "template_part_{$area}" );
+	$content = wp_filter_content_tags( $content );
 
 	// Handle embeds for block template parts.
 	global $wp_embed;