Skip to content

i18n: Preserve block attribute encoding #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaggieCabrera wants to merge 1 commit into
base: trunk
Choose a base branch
from
+31 −11
Open

i18n: Preserve block attribute encoding #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions includes/create-theme/theme-locale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,19 +435,19 @@ function ( $matches ) {

// If we modified any attributes, re-encode to JSON.
if ( $modified ) {
$attr_fragments = array();
foreach ( $attrs as $attr_name => $attr_value ) {
$encoded_attr_name = wp_json_encode( (string) $attr_name, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES );

if ( array_key_exists( $attr_name, $localized_attrs ) ) {
$attr_fragments[] = $encoded_attr_name . ':' . wp_json_encode( $localized_attrs[ $attr_name ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES );
continue;
}

$attr_fragments[] = $encoded_attr_name . ':' . wp_json_encode( $attr_value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES );
$attrs_for_serialization = $attrs;
$replacements = array();
foreach ( $localized_attrs as $attr_name => $localized_value ) {
do {
$placeholder = '__CBT_LOCALIZED_ATTRIBUTE_' . wp_generate_uuid4() . '__';
} while ( false !== strpos( $attrs_json, $placeholder ) || isset( $replacements[ '"' . $placeholder . '"' ] ) );

$attrs_for_serialization[ $attr_name ] = $placeholder;
$replacements[ '"' . $placeholder . '"' ] = wp_json_encode( $localized_value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES );
}

$new_attrs_json = '{' . implode( ',', $attr_fragments ) . '}';
$new_attrs_json = serialize_block_attributes( $attrs_for_serialization );
$new_attrs_json = strtr( $new_attrs_json, $replacements );
return '<!-- wp:' . $block_name . ' ' . $new_attrs_json . ' ' . $self_closer . '-->';
}

Expand Down
20 changes: 20 additions & 0 deletions tests/CbtThemeLocale/escapeBlockAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,26 @@ public function test_escape_block_attribute_with_percent_and_token() {
$this->assert_search_block_attributes_json_decodes( $escaped_markup );
}

public function test_escape_block_attributes_preserves_core_encoding_for_other_attributes() {
$block_markup = '<!-- wp:navigation-link ' . serialize_block_attributes(
array(
'label' => 'About',
'url' => '<?php echo "kept encoded"; ?>',
'title' => 'Keep -- < > & encoded',
)
) . ' /-->';

$blocks = parse_blocks( $block_markup );
$escaped_blocks = CBT_Theme_Locale::escape_text_content_of_blocks( $blocks );
$escaped_markup = serialize_blocks( $escaped_blocks );
$escaped_markup = CBT_Theme_Locale::escape_block_attribute_strings( $escaped_markup );

$this->assertStringContainsString( '"label":"<?php esc_attr_e(', $escaped_markup );
$this->assertStringContainsString( '"url":"\\u003c?php echo \\u0022kept encoded\\u0022; ?\\u003e"', $escaped_markup );
$this->assertStringContainsString( '"title":"Keep \\u002d\\u002d \\u003c \\u003e \\u0026 encoded"', $escaped_markup );
$this->assertStringNotContainsString( '"url":"<?php', $escaped_markup );
}

public function data_test_escape_block_attributes() {
return array(

Expand Down
Loading