Skip to content

Improve Interactivity API store JSON encoding #6520

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

Closed
sirreal wants to merge 12 commits into from
+96 −7
Closed

Improve Interactivity API store JSON encoding #6520

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a99ec25
Improve Interactivity API store JSON encoding
sirreal May 7, 2024
8a6d30f
Only set unescaped unicode with UTF-8
sirreal May 8, 2024
312d6ea
Remove JSON_HEX_AMP
sirreal May 9, 2024
3e30117
Add JSON_UNESCAPED_LINE_TERMINATORS
sirreal May 9, 2024
cf29aa6
Add comments
sirreal May 9, 2024
76c7a5e
Smaller config in test
sirreal May 9, 2024
f2b07eb
Fix heredoc end
sirreal May 9, 2024
5c2d273
Remove bad function arg trailing comma
sirreal May 9, 2024
b9cd850
Add more details to comments
sirreal May 9, 2024
8a7e4e0
Remove redundant tear_down method.
sirreal May 10, 2024
67bd236
Merge branch 'trunk' into add/iapi-better-json-encoding
dmsnell May 15, 2024
7ecc709
Rearrange comment and set UTF-8 as the normative encoding.
dmsnell May 15, 2024
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
7 changes: 6 additions & 1 deletion src/wp-includes/interactivity-api/class-wp-interactivity-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,15 @@ public function print_client_interactivity_data() {
}

if ( ! empty( $interactivity_data ) ) {
$json_encode_flags = JSON_HEX_TAG | JSON_HEX_AMP | JSON_UNESCAPED_SLASHES;
if ( str_starts_with( get_option( 'blog_charset' ), 'UTF-' ) ) {
$json_encode_flags |= JSON_UNESCAPED_UNICODE;
}

wp_print_inline_script_tag(
wp_json_encode(
$interactivity_data,
JSON_HEX_TAG | JSON_HEX_AMP
$json_encode_flags
),
array(
'type' => 'application/json',
Expand Down