From 1ea37c466d71148bd4bf4910c26b3d576c17078a Mon Sep 17 00:00:00 2001 From: jorgefilipecosta Date: Fri, 14 Oct 2022 10:47:14 +0000 Subject: [PATCH] Global Styles: Improve performance of WP_Theme_JSON::get_merged_data method. In the WordPress 6.1 cycle, WP_Theme_JSON_Resolver::get_merged_data method has become a hot path that is called many times. By improving small things that are repeated multiple times, we get more performance wins. This commit reduces the number of calls of the low-level WP_Theme_JSON->merge method, with the corresponding performance improvements. Props oandregal, aristath, mukeshpanchal27. See #56467. Built from https://develop.svn.wordpress.org/trunk@54517 git-svn-id: http://core.svn.wordpress.org/trunk@54072 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-theme-json-resolver.php | 3 +-- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php index 993543a55b..18b997561c 100644 --- a/wp-includes/class-wp-theme-json-resolver.php +++ b/wp-includes/class-wp-theme-json-resolver.php @@ -548,8 +548,7 @@ class WP_Theme_JSON_Resolver { _deprecated_argument( __FUNCTION__, '5.9.0' ); } - $result = new WP_Theme_JSON(); - $result->merge( static::get_core_data() ); + $result = static::get_core_data(); $result->merge( static::get_block_data() ); $result->merge( static::get_theme_data() ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 042aec624f..1eb550cfef 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-RC1-54511'; +$wp_version = '6.1-RC1-54517'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.