Changeset 28461

Timestamp:

05/16/2014 09:28:05 PM (11 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_update_term().

See #22400.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (4 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -2889 +2889 @@
     $args = wp_parse_args($args, $defaults);
     $args = sanitize_term($args, $taxonomy, 'db');
-    extract($args, EXTR_SKIP);
+    $parsed_args = $args;
 
     // expected_slashed ($name)
-    $name = wp_unslash($name);
-    $description = wp_unslash($description);
+    $name = wp_unslash( $args['name'] );
+    $description = wp_unslash( $args['description'] );
+
+    $parsed_args['name'] = $name;
+    $parsed_args['description'] = $description;
 
     if ( '' == trim($name) )
@@ -2899 +2902 @@
 
     $empty_slug = false;
-    if ( empty($slug) ) {
+    if ( empty( $args['slug'] ) ) {
         $empty_slug = true;
         $slug = sanitize_title($name);
-    }
-
-    if ( $alias_of ) {
-        $alias = $wpdb->get_row( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $alias_of) );
+    } else {
+        $slug = $args['slug'];
+    }
+
+    $parsed_args['slug'] = $slug;
+
+    if ( $args['alias_of'] ) {
+        $alias = $wpdb->get_row( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $args['alias_of'] ) );
         if ( $alias->term_group ) {
             // The alias we want is already in a group, so let's use that one.
@@ -2920 +2927 @@
             do_action( 'edited_terms', $alias->term_id, $taxonomy );
         }
+
+        $parsed_args['term_group'] = $term_group;
     }
 
@@ -2929 +2938 @@
      * @since 3.1.0
      *
-     * @param int    $parent   ID of the parent term.
-     * @param int    $term_id  Term ID.
-     * @param string $taxonomy Taxonomy slug.
-     * @param array  $args     Compacted array of update arguments for the given term.
-     * @param array  $args     An array of update arguments for the given term.
+     * @param int    $parent      ID of the parent term.
+     * @param int    $term_id     Term ID.
+     * @param string $taxonomy    Taxonomy slug.
+     * @param array  $parsed_args An array of potentially altered update arguments for the given term.
+     * @param array  $args        An array of update arguments for the given term.
      */
-    $parent = apply_filters( 'wp_update_term_parent', $parent, $term_id, $taxonomy, compact( array_keys( $args ) ), $args );
+    $parent = apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
 
     // Check for duplicate slug