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

Timestamp:

03/01/2023 04:15:27 PM (22 months ago)

Author:

audrasjb

Message:

Editor: Ensure Global styles values are reset in the site editor.

This changeset fixes a bug by which the reset function of the global styles sidebar would not work as expected in the site editor. It reverts [54517] and adds related unit tests.

Props oandregal, ntsekouras, youknowriad, hellofromTonya.
Fixes #57824
See #56467

File:

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

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

@@ -560 +560 @@
         }
 
-        $result = static::get_core_data();
+        $result = new WP_Theme_JSON();
+        $result->merge( static::get_core_data() );
         if ( 'default' === $origin ) {
             $result->set_spacing_sizes();