Changeset 28423

Timestamp:

05/15/2014 05:42:55 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in get_objects_in_term(). Only one property (order) was extracted.

See #22400.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -577 +577 @@
         global $wpdb;
 
-        if ( ! is_array( $term_ids ) )
+        if ( ! is_array( $term_ids ) ) {
                 $term_ids = array( $term_ids );
-
-        if ( ! is_array( $taxonomies ) )
+        }
+        if ( ! is_array( $taxonomies ) ) {
                 $taxonomies = array( $taxonomies );
-
+        }
         foreach ( (array) $taxonomies as $taxonomy ) {
-                if ( ! taxonomy_exists( $taxonomy ) )
+                if ( ! taxonomy_exists( $taxonomy ) ) {
                         return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+                }
         }
 
         $defaults = array( 'order' => 'ASC' );
         $args = wp_parse_args( $args, $defaults );
-        extract( $args, EXTR_SKIP );
-
-        $order = ( 'desc' == strtolower( $order ) ) ? 'DESC' : 'ASC';
+
+        $order = ( 'desc' == strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
 
         $term_ids = array_map('intval', $term_ids );
@@ -601 +601 @@
         $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
 
-        if ( ! $object_ids )
+        if ( ! $object_ids ){
                 return array();
-
+        }
         return $object_ids;
 }