Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global Settings: simplify logic to retrieve settings by editor #35437

Merged
merged 1 commit into from
Oct 8, 2021

Conversation

oandregal
Copy link
Member

Follow-up to #35424 and #35427

This PR simplifies the logic to load different settings per editor context.

@oandregal oandregal self-assigned this Oct 7, 2021
@oandregal oandregal added [Type] Code Quality Issues or PRs that relate to code quality Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json labels Oct 7, 2021
@oandregal oandregal force-pushed the update/clean-up-gs-settings branch from 22f4377 to 4c86a01 Compare October 7, 2021 17:07
$origin = 'user';
}
$consolidated = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $settings, $origin );
$consolidated = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $settings );
Copy link
Member Author

@oandregal oandregal Oct 7, 2021

Choose a reason for hiding this comment

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

There may be user data even if the theme does not have a theme.json, as per #35427 so we need to update user data lookup to the new logic.

@oandregal
Copy link
Member Author

I'm milestoning this for 11.7 as it's a follow up to #35427 and #35424 that will be part of 11.7 as well.

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] Code Quality Issues or PRs that relate to code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant