mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-22 23:54:09 +01:00
Code Issues Actions 12 Packages 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@54810 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-11-11 12:37:10 +00:00
parent 23a646a25a
commit 4a827498ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/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();