Skip to content

Commit

Permalink
Fix wrong conflict resolution when cherry picking
Browse files Browse the repository at this point in the history
  • Loading branch information
priethor authored and desrosj committed May 20, 2023
1 parent fed5bb0 commit 6b27047
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/block-library/src/template-part/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6b27047

Please sign in to comment.