Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-02 05:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Coding Standards: Declare $wp_taxonomies global at the top of unregister_taxonomy().

Browse Source 
This brings some consistency with how the global is declared in other taxonomy functions.

Follow-up to [36243], [38747], [54794].

See #57058.
Built from https://develop.svn.wordpress.org/trunk@54810


git-svn-id: http://core.svn.wordpress.org/trunk@54362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-11-11 12:39:13 +00:00
parent 702344e383
commit eb68614e2e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/taxonomy.php
View File

@ -564,6 +564,8 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
* @return true|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist. * @return true|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
*/ */
function unregister_taxonomy( $taxonomy ) { function unregister_taxonomy( $taxonomy ) {
global $wp_taxonomies;
if ( ! taxonomy_exists( $taxonomy ) ) { if ( ! taxonomy_exists( $taxonomy ) ) {
return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) ); return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
} }
@ -575,8 +577,6 @@ function unregister_taxonomy( $taxonomy ) {
return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) ); return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) );
} }
global $wp_taxonomies;
$taxonomy_object->remove_rewrite_rules(); $taxonomy_object->remove_rewrite_rules();
$taxonomy_object->remove_hooks(); $taxonomy_object->remove_hooks();

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.2-alpha-54804'; $wp_version = '6.2-alpha-54810';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.