WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Built from https://develop.svn.wordpress.org/trunk@55448


git-svn-id: http://core.svn.wordpress.org/trunk@54981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2023-03-01 16:17:18 +00:00
parent 47c492b114
commit 0b2a7b380f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-theme-json-resolver.php
View File

@ -559,7 +559,8 @@ class WP_Theme_JSON_Resolver {
_deprecated_argument( __FUNCTION__, '5.9.0' ); _deprecated_argument( __FUNCTION__, '5.9.0' );
} }
$result = static::get_core_data(); $result = new WP_Theme_JSON();
$result->merge( static::get_core_data() );
if ( 'default' === $origin ) { if ( 'default' === $origin ) {
$result->set_spacing_sizes(); $result->set_spacing_sizes();
return $result; return $result;

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.2-beta3-55447'; $wp_version = '6.2-beta3-55448';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.