Ticket #22400: wp-delete-term.diff

src/wp-includes/taxonomy.php

@@ -2033 +2033 @@
         }
 
         $args = wp_parse_args($args, $defaults);
-        extract($args, EXTR_SKIP);
 
-        if ( isset( $default ) ) {
-                $default = (int) $default;
+        if ( isset( $args['default'] ) ) {
+                $default = (int) $args['default'];
                 if ( ! term_exists($default, $taxonomy) )
                         unset($default);
         }
@@ -2078 +2077 @@
                         $terms = array($default);
                 } else {
                         $terms = array_diff($terms, array($term));
-                        if (isset($default) && isset($force_default) && $force_default)
+                        if (isset($default) && isset( $args['force_default'] ) && $args['force_default'] )
                                 $terms = array_merge($terms, array($default));
                 }
                 $terms = array_map('intval', $terms);