diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php index d63a84353c..3246992a42 100644 --- a/wp-includes/class-wp-theme-json-resolver.php +++ b/wp-includes/class-wp-theme-json-resolver.php @@ -933,18 +933,14 @@ class WP_Theme_JSON_Resolver { return $theme_json; } - $resolved_theme_json_data = array( - 'version' => WP_Theme_JSON::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( $resolved_theme_json_data ) ); - - return $theme_json; + return new WP_Theme_JSON( $resolved_theme_json_data ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index aa3238388b..292679e998 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-alpha-59337'; +$wp_version = '6.8-alpha-59338'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.