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

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

File:

• trunk/wp-includes/query.php (modified) (1 diff)

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