-
Notifications
You must be signed in to change notification settings - Fork 998
Update to WPCS v3 #5834
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
Merged
Merged
Update to WPCS v3 #5834
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schlessera
commented
Aug 30, 2023
Comment on lines
-510
to
-545
|
||
/** | ||
* Internalized version of global_terms_enabled() to get around a bug in WordPress Core. | ||
* | ||
* WP Core inadvertently removed the function instead of deprecating it during th 6.1 cycle. | ||
* | ||
* @see https://core.trac.wordpress.org/ticket/21734#comment:34 | ||
*/ | ||
function global_terms_enabled() { | ||
if ( ! is_multisite() ) { | ||
return false; | ||
} | ||
|
||
static $global_terms = null; | ||
if ( is_null( $global_terms ) ) { | ||
|
||
/** | ||
* Filters whether global terms are enabled. | ||
* | ||
* Returning a non-null value from the filter will effectively short-circuit the function | ||
* and return the value of the 'global_terms_enabled' site option instead. | ||
* | ||
* @since 3.0.0 | ||
* | ||
* @param null $enabled Whether global terms are enabled. | ||
*/ | ||
$filter = apply_filters( 'global_terms_enabled', null ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound | ||
if ( ! is_null( $filter ) ) { | ||
$global_terms = (bool) $filter; | ||
} else { | ||
$global_terms = (bool) get_site_option( 'global_terms_enabled', false ); | ||
} | ||
} | ||
|
||
return $global_terms; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I decided to remove this again, as it was only needed for WP 6.1 Beta 1 and fixed for the final WP 6.1 release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
swissspidy
approved these changes
Aug 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Auto-generated PR that updates WPCS to the latest v3 and then fixes all automatically fixable issues.
See wp-cli/wp-cli-tests#175