From 4a827498eaf6daa66d406d0bbaa743acef0f2978 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 11 Nov 2022 12:37:10 +0000 Subject: [PATCH] Coding Standards: Declare `$wp_taxonomies` global at the top of `unregister_taxonomy()`. 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 --- src/wp-includes/taxonomy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index be19a14148..5b70968185 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -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. */ function unregister_taxonomy( $taxonomy ) { + global $wp_taxonomies; + if ( ! taxonomy_exists( $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.' ) ); } - global $wp_taxonomies; - $taxonomy_object->remove_rewrite_rules(); $taxonomy_object->remove_hooks();