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

Timestamp:

04/25/2011 05:27:35 PM (13 years ago)

Author:

ryan

Message:

Introduce WP_Meta_Query and relation support. Props scribu, greuben. fixes #17165 #17011

File:

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

trunk/wp-includes/query.php

@@ -848 +848 @@
      */
     var $tax_query;
+
+    /**
+     * Metadata query container
+     *
+     * @since 3.2
+     * @access public
+     * @var object WP_Meta_Query
+     */
+    var $meta_query = false;
 
     /**
@@ -1526 +1535 @@
             unset( $tax_query );
 
-            _parse_meta_query( $qv );
-
             if ( empty($qv['author']) || ($qv['author'] == '0') ) {
                 $this->is_author = false;
@@ -1901 +1908 @@
         $q = $this->fill_query_vars($q);
 
+        // Parse meta query
+        $this->meta_query = new WP_Meta_Query();
+        $this->meta_query->parse_query_vars( $q );
+
         // Set a flag if a pre_get_posts hook changed the query vars.
         $hash = md5( serialize( $this->query_vars ) );
@@ -2236 +2247 @@
         }
 
-        if ( !empty( $this->tax_query->queries ) || !empty( $q['meta_key'] ) ) {
+        if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
             $groupby = "{$wpdb->posts}.ID";
         }
@@ -2469 +2480 @@
         }
 
-        // Parse the meta query again if query vars have changed.
-        if ( $this->query_vars_changed ) {
-            $meta_query_hash = md5( serialize( $q['meta_query'] ) );
-            $_meta_query = $q['meta_query'];
-            unset( $q['meta_query'] );
-            _parse_meta_query( $q );
-            if ( md5( serialize( $q['meta_query'] ) ) != $meta_query_hash && is_array( $_meta_query ) )
-                $q['meta_query'] = array_merge( $_meta_query, $q['meta_query'] );
-        }
-
-        if ( !empty( $q['meta_query'] ) ) {
-            $clauses = call_user_func_array( '_get_meta_sql', array( $q['meta_query'], 'post', $wpdb->posts, 'ID', &$this) );
+        if ( !empty( $this->meta_query->queries ) ) {
+            $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
             $join .= $clauses['join'];
             $where .= $clauses['where'];