From f5d79e0b2311bae951202309f0f9ef77205570a6 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 5 Dec 2021 18:02:08 +0000 Subject: [PATCH] Docs: Add missing summary for `WP_Theme_JSON_Resolver::get_merged_data()`. Follow-up to [50959]. See #53399. Built from https://develop.svn.wordpress.org/trunk@52323 git-svn-id: http://core.svn.wordpress.org/trunk@51915 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-theme-json-resolver.php | 16 +++++++++------- wp-includes/version.php | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php index 3fdd9da87e..339a2ff0c5 100644 --- a/wp-includes/class-wp-theme-json-resolver.php +++ b/wp-includes/class-wp-theme-json-resolver.php @@ -178,11 +178,11 @@ class WP_Theme_JSON_Resolver { } /* - * We want the presets and settings declared in theme.json - * to override the ones declared via theme supports. - * So we take theme supports, transform it to theme.json shape - * and merge the self::$theme upon that. - */ + * We want the presets and settings declared in theme.json + * to override the ones declared via theme supports. + * So we take theme supports, transform it to theme.json shape + * and merge the self::$theme upon that. + */ $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() ); if ( ! self::theme_has_support() ) { if ( ! isset( $theme_support_data['settings']['color'] ) ) { @@ -315,8 +315,8 @@ class WP_Theme_JSON_Resolver { return new WP_Theme_JSON( $config, 'custom' ); } - // Very important to verify if the flag isGlobalStylesUserThemeJSON is true. - // If is not true the content was not escaped and is not safe. + // Very important to verify that the flag isGlobalStylesUserThemeJSON is true. + // If it's not true then the content was not escaped and is not safe. if ( is_array( $decoded_data ) && isset( $decoded_data['isGlobalStylesUserThemeJSON'] ) && @@ -332,6 +332,8 @@ class WP_Theme_JSON_Resolver { } /** + * Returns the data merged from multiple origins. + * * There are three sources of data (origins) for a site: * default, theme, and custom. The custom's has higher priority * than the theme's, and the theme's higher than default's. diff --git a/wp-includes/version.php b/wp-includes/version.php index d77f0c04c7..c1bcd4daeb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-beta1-52322'; +$wp_version = '5.9-beta1-52323'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.