Changeset 15581

Timestamp:

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

Author:

scribu

Message:

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

Location:

trunk/wp-includes

Files:

• functions.php (modified) (3 diffs)
• query.php (modified) (1 diff)

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 );
+        }
     }
 

trunk/wp-includes/query.php

@@ -2212 +2212 @@
 
         // postmeta queries
-        if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) )
-            $join .= " JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
-        if ( ! empty($q['meta_key']) )
-            $where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
-        if ( ! empty($q['meta_value']) ) {
-            if ( empty($q['meta_compare']) || ! in_array($q['meta_compare'], array('=', '!=', '>', '>=', '<', '<=')) )
-                $q['meta_compare'] = '=';
-
-            $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_value {$q['meta_compare']} %s ", $q['meta_value']);
-        }
+        $meta_query = wp_array_slice_assoc( $q, array( 'meta_key', 'meta_value', 'meta_compare' ) );
+        list( $meta_join, $meta_where ) = _wp_meta_sql( array( $meta_query ), $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
+        $join .= $meta_join;
+        $where .= $meta_where;
 
         // Apply filters on where and join prior to paging so that any