Skip to content

Commit

Permalink
Fix for WP_Theme_JSON_Resolver_Gutenberg::get_merged_data (#48644)
Browse files Browse the repository at this point in the history
  • Loading branch information
oandregal authored and ntsekouras committed Mar 1, 2023
1 parent 35f10c1 commit 374dca4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/class-wp-theme-json-resolver-gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,8 @@ public static function get_merged_data( $origin = 'custom' ) {
_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 ) {
$result->set_spacing_sizes();
return $result;
Expand Down

1 comment on commit 374dca4

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in 374dca4.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/4305834634
📝 Reported issues:

Please sign in to comment.