From 4e6bd4dbe1f07a2f17b685c697f05db7f697f72d Mon Sep 17 00:00:00 2001 From: Ramon Date: Mon, 4 Nov 2024 13:25:47 +1100 Subject: [PATCH] Theme JSON Resolver: remove theme json merge in resolve_theme_file_uris (#66662) Removes unnecessary merge. We're only setting values for paths. Add a Backport log. Co-authored-by: ramonjd Co-authored-by: aaronrobertshaw Co-authored-by: andrewserong --- backport-changelog/6.8/7698.md | 3 +++ lib/class-wp-theme-json-resolver-gutenberg.php | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 backport-changelog/6.8/7698.md diff --git a/backport-changelog/6.8/7698.md b/backport-changelog/6.8/7698.md new file mode 100644 index 00000000000000..3ded160e7ec449 --- /dev/null +++ b/backport-changelog/6.8/7698.md @@ -0,0 +1,3 @@ +https://github.com/WordPress/wordpress-develop/pull/7698 + +* https://github.com/WordPress/gutenberg/pull/66662 diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php index 2231cb0f11538f..cd02b5a45c22f7 100644 --- a/lib/class-wp-theme-json-resolver-gutenberg.php +++ b/lib/class-wp-theme-json-resolver-gutenberg.php @@ -920,18 +920,14 @@ public static function resolve_theme_file_uris( $theme_json ) { return $theme_json; } - $resolved_theme_json_data = array( - 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA, - ); + $resolved_theme_json_data = $theme_json->get_raw_data(); foreach ( $resolved_urls as $resolved_url ) { $path = explode( '.', $resolved_url['target'] ); _wp_array_set( $resolved_theme_json_data, $path, $resolved_url['href'] ); } - $theme_json->merge( new WP_Theme_JSON_Gutenberg( $resolved_theme_json_data ) ); - - return $theme_json; + return new WP_Theme_JSON_Gutenberg( $resolved_theme_json_data ); } /**