Changeset 28422

Timestamp:

05/15/2014 05:40:40 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in WP_Tax_Query::get_sql(). All unit tests still pass.

See #22400.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -739 +739 @@
                         $this->clean_query( $query );
 
-                        if ( is_wp_error( $query ) )
+                        if ( is_wp_error( $query ) ) {
                                 return self::$no_results;
-
-                        extract( $query );
+                        }
+
+                        $terms = $query['terms'];
+                        $operator = $query['operator'];
 
                         if ( 'IN' == $operator ) {
@@ -748 +750 @@
                                 if ( empty( $terms ) ) {
                                         if ( 'OR' == $this->relation ) {
-                                                if ( ( $index + 1 === $count ) && empty( $where ) )
+                                                if ( ( $index + 1 === $count ) && empty( $where ) ) {
                                                         return self::$no_results;
+                                                }
                                                 continue;
                                         } else {
@@ -767 +770 @@
                         } elseif ( 'NOT IN' == $operator ) {
 
-                                if ( empty( $terms ) )
+                                if ( empty( $terms ) ) {
                                         continue;
+                                }
 
                                 $terms = implode( ',', $terms );
@@ -779 +783 @@
                         } elseif ( 'AND' == $operator ) {
 
-                                if ( empty( $terms ) )
+                                if ( empty( $terms ) ) {
                                         continue;
+                                }
 
                                 $num_terms = count( $terms );
@@ -797 +802 @@
                 }
 
-                if ( ! empty( $where ) )
+                if ( ! empty( $where ) ) {
                         $where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
-                else
+                } else {
                         $where = '';
-
+                }
                 return compact( 'join', 'where' );
         }