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

Timestamp:

06/06/2024 08:00:08 AM (8 months ago)

Author:

oandregal

Message:

Editor: code quality improvements for theme.json migrate API

Backports ​https://github.com/WordPress/gutenberg/pull/62305

Follow-up to [58328], #61282.

Props ajlende, oandregal, ramonopoly, mukesh27.
Fixes #61282.

File:

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

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

@@ -526 +526 @@
                 $decoded_data['isGlobalStylesUserThemeJSON']
             ) {
+                unset( $decoded_data['isGlobalStylesUserThemeJSON'] );
                 $config = $decoded_data;
             }
@@ -531 +532 @@
 
         /** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
-        $theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
-        $config     = $theme_json->get_data();
-
-        // Needs to be set for schema migrations of user data.
-        $config['isGlobalStylesUserThemeJSON'] = true;
-
-        static::$user = new WP_Theme_JSON( $config, 'custom' );
+        $theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
+        static::$user = $theme_json->get_theme_json();
 
         return static::$user;