Skip to content

Hotfix for leftovers of WP_Theme_JSON_Resolver::get_merged_data#36173

Merged
oandregal merged 2 commits intotrunkfrom
fix/theme-supports-data-in-theme-json
Nov 3, 2021
Merged

Hotfix for leftovers of WP_Theme_JSON_Resolver::get_merged_data#36173
oandregal merged 2 commits intotrunkfrom
fix/theme-supports-data-in-theme-json

Conversation

@oandregal
Copy link
Copy Markdown
Member

Follow-up to #36054

Some PRs got merged in parallel to #36054 and we didn't remove the settings argument to the WP_Theme_JSON_Resolver::get_merged_data for all of them.

How to test

  • Use the TT1-blocks theme.
  • Go to the site editor and add a new color. Save.
  • Go to the post editor and open the color panel of a block.

The expected result is that it has the new user color. Without this PR, it doesn't.

@oandregal oandregal self-assigned this Nov 3, 2021
@oandregal oandregal added [Type] Bug An existing feature does not function as intended Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json labels Nov 3, 2021
@oandregal
Copy link
Copy Markdown
Member Author

I'm hotfixing this to unblock #35970 as soon as tests pass.

@oandregal oandregal merged commit 3e84b56 into trunk Nov 3, 2021
@oandregal oandregal deleted the fix/theme-supports-data-in-theme-json branch November 3, 2021 11:42
@github-actions github-actions bot added this to the Gutenberg 11.9 milestone Nov 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json [Type] Bug An existing feature does not function as intended

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant