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

Move changes from #38681 and #39966 to compat 6.0 #40123

Merged
merged 6 commits into from
Apr 7, 2022

Conversation

ajlende
Copy link
Contributor

@ajlende ajlende commented Apr 7, 2022

Moved compat/wordpress-5.9 changes that didn't make it into 5.9.x from #38681 and #39966 into compat/wordpress-6.0.

See #38681 (comment) and #39966 (review)

@ajlende ajlende requested a review from oandregal April 7, 2022 03:12
@ajlende ajlende self-assigned this Apr 7, 2022
lib/load.php Show resolved Hide resolved
@oandregal oandregal merged commit 4fed55b into trunk Apr 7, 2022
@oandregal oandregal deleted the fix/move-preset-changes-from-59-to-60 branch April 7, 2022 08:51
@github-actions github-actions bot added this to the Gutenberg 13.0 milestone Apr 7, 2022
@oandregal
Copy link
Member

I've missed that there was a WP_Theme_JSON_Resolver_Gutenberg living at lib/experimental and a WP_Theme_JSON_Resolver_6_0 living at lib/compat/6.0 and that both had changes to the same method get_theme_data.

I'm fixing it at #40140

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants