Changeset 52323

Timestamp:

12/05/2021 06:01:00 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Docs: Add missing summary for WP_Theme_JSON_Resolver::get_merged_data().

Follow-up to [50959].

See #53399.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -179 +179 @@
 
                 /*
-                * 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() ) {
@@ -316 +316 @@
                         }
 
-                        // 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 ) &&
@@ -333 +333 @@
 
         /**
+         * 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