Changeset 15581 for trunk/wp-includes/functions.php

Timestamp:

09/06/2010 11:28:59 AM (16 years ago)

Author:

scribu

Message:

Use _wp_meta_sql() in WP_Query. See #14572. See #14645

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -4255 +4255 @@
         $clauses = array();
 
+        $join = '';
+        $where = '';
+        $i = 0;
         foreach ( $queries as $q ) {
                 $meta_key = isset( $q['meta_key'] ) ? trim( $q['meta_key'] ) : '';
@@ -4263 +4266 @@
                         $meta_compare = '=';
 
-                if ( empty( $meta_key ) )
+                if ( empty( $meta_key ) && empty( $meta_value ) )
                         continue;
 
-                if ( empty( $meta_value ) ) {
-                        $clauses[ $meta_key ] = "";
-                } elseif ( 'like' == $meta_compare ) {
-                        $clauses[ $meta_key ] = $wpdb->prepare( "LIKE %s", '%' . like_escape( $meta_value ) . '%' );
-                } else {
-                        $clauses[ $meta_key ] = $wpdb->prepare( "$meta_compare %s", $meta_value );
-                }
-        }
-
-        if ( empty( $clauses ) )
-                return array('', '');
-
-        $join = '';
-        $where = '';
-
-        $i = 0;
-        foreach ( $clauses as $meta_key => $value_query ) {
                 $alias = $i ? 'mt' . $i : $meta_table;
 
@@ -4289 +4275 @@
                 $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
 
-                $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
-                if ( !empty( $value_query ) )
-                        $where .= " AND $alias.meta_value $value_query";
-                        
                 $i++;
+
+                if ( !empty( $meta_key ) )
+                        $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
+
+                if ( empty( $meta_value ) )
+                        continue;
+
+                if ( 'like' == $meta_compare ) {
+                        $where .= $wpdb->prepare( " AND $alias.meta_value LIKE %s", '%' . like_escape( $meta_value ) . '%' );
+                } else {
+                        $where .= $wpdb->prepare( " AND $alias.meta_value $meta_compare %s", $meta_value );
+                }
         }