Skip to content

Ensure block editor preloading middleware JSON is correctly escaped #8145

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 14 commits into from
Closed

Ensure block editor preloading middleware JSON is correctly escaped #8145

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0230b1d
Add test with assertEqualHTML
sirreal Jun 11, 2025
97d3098
Update or fix tests
sirreal May 30, 2025
7e5d18a
Clean up test function name and documentation
sirreal Jun 11, 2025
af03c20
Revert test/data provider rename
sirreal Jun 11, 2025
38dfe96
Simplify test
sirreal Jun 11, 2025
5bf2ebf
Fix issue with other site urls in tests
sirreal Jun 11, 2025
5f10fb6
Fix json encode that may break enclosing script tag
sirreal Jan 17, 2025
e5b04e4
Always use JSON_HEX_TAG | JSON_UNESCAPED_SLASHES flags
sirreal Jun 11, 2025
554080b
Revert "Always use JSON_HEX_TAG | JSON_UNESCAPED_SLASHES flags"
sirreal Jul 16, 2025
3f4f86d
Revert "Fix json encode that may break enclosing script tag"
sirreal Jul 16, 2025
495e938
Reapply "Fix json encode that may break enclosing script tag"
sirreal Jul 16, 2025
f060cd4
Reapply "Always use JSON_HEX_TAG | JSON_UNESCAPED_SLASHES flags"
sirreal Jul 16, 2025
3927310
Fix typo and improve test description
sirreal Aug 19, 2025
1b41f43
Fix test
sirreal Aug 19, 2025
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
Prev Previous commit
Next Next commit
Revert "Always use JSON_HEX_TAG | JSON_UNESCAPED_SLASHES flags" 
This reverts commit d630c7d5610ab5ba91e0c304776add3d8daf40ec.
  • Loading branch information
@sirreal
sirreal committed Aug 19, 2025
commit 554080bd11faf9c2a1efb677f91c880f6fe987fb
7 changes: 6 additions & 1 deletion src/wp-includes/block-editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,11 +762,16 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
$wp_scripts = $backup_wp_scripts;
$wp_styles = $backup_wp_styles;

$json_encode_flags = JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_LINE_TERMINATORS;
if ( ! is_utf8_charset() ) {
$json_encode_flags = JSON_HEX_TAG | JSON_UNESCAPED_SLASHES;
}

wp_add_inline_script(
'wp-api-fetch',
sprintf(
'wp.apiFetch.use( wp.apiFetch.createPreloadingMiddleware( %s ) );',
wp_json_encode( $preload_data, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES )
wp_json_encode( $preload_data, $json_encode_flags )
),
'after'
);
Expand Down