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

Use wp-settings.php instead of wp-settings-cli.php for >=WP4.6 #3031

Merged
merged 4 commits into from Jun 17, 2016

Conversation

danielbachhuber
Copy link
Member

Maintaining a fork isn't a ton of fun.

Fixes #2278

Because `wp-settings.php` doesn't globalize `$wpdb` itself, calling
`wp-settings.php` inside of a class method means that
`wp-includes/ms-settings.php` (which uses `$wpdb` but doesn't globalize
it) will break unexpectedly.

This problem was obscured originally because WP-CLI globalizes $wpdb,
see b376153
@aaronjorbin
Copy link

Do you want to merge this and then have me bump the version or the other way around?

@danielbachhuber
Copy link
Member Author

Do you want to merge this and then have me bump the version or the other way around?

Although the approach I've taken (using a lower version number) is imprecise, I think it works fine for our needs. Developers running trunk should be updating trunk regularly anyway.

In short, no version bump needed in this particular case.

@danielbachhuber danielbachhuber merged commit 860f5bf into master Jun 17, 2016
@danielbachhuber danielbachhuber deleted the 2278-use-wp-settings branch June 17, 2016 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants