Changes from branches/3.1/wp-includes/query.php at r17805 to trunk/wp-includes/query.php at r18268

File:

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

trunk/wp-includes/query.php

@@ -850 +850 @@
 
     /**
+     * Metadata query container
+     *
+     * @since 3.2.0
+     * @access public
+     * @var object WP_Meta_Query
+     */
+    var $meta_query = false;
+
+    /**
      * Holds the data for a single object that is queried.
      *
@@ -1248 +1257 @@
      */
     var $query_vars_changed = true;
+
+    /**
+     * Set if post thumbnails are cached
+     *
+     * @since 3.2.0
+     * @access public
+     * @var bool
+     */
+     var $thumbnails_cached = false;
 
     /**
@@ -1526 +1544 @@
             unset( $tax_query );
 
-            _parse_meta_query( $qv );
-
             if ( empty($qv['author']) || ($qv['author'] == '0') ) {
                 $this->is_author = false;
@@ -1626 +1642 @@
         }
 
-        if ( !empty($qv['post_status']) )
-            $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+        if ( ! empty( $qv['post_status'] ) ) {
+            if ( is_array( $qv['post_status'] ) )
+                $qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+            else
+                $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+        }
 
         if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
@@ -1897 +1917 @@
         $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 ) );
@@ -2156 +2180 @@
                 $searchand = ' AND ';
             }
-            $term = esc_sql( like_escape( $q['s'] ) );
-            if ( empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
-                $search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";
 
             if ( !empty($search) ) {
@@ -2230 +2251 @@
                 unset( $tag_query );
             }
+        }
+
+        if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+            $groupby = "{$wpdb->posts}.ID";
         }
 
@@ -2288 +2313 @@
         // Order by
         if ( empty($q['orderby']) ) {
-            $q['orderby'] = "$wpdb->posts.post_date " . $q['order'];
+            $orderby = "$wpdb->posts.post_date " . $q['order'];
         } elseif ( 'none' == $q['orderby'] ) {
-            $q['orderby'] = '';
+            $orderby = '';
         } else {
             // Used to filter values
@@ -2301 +2326 @@
             $q['orderby'] = urldecode($q['orderby']);
             $q['orderby'] = addslashes_gpc($q['orderby']);
-            $orderby_array = explode(' ', $q['orderby']);
-            $q['orderby'] = '';
-
-            foreach ( $orderby_array as $i => $orderby ) {
+
+            $orderby_array = array();
+            foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
                 // Only allow certain values for safety
                 if ( ! in_array($orderby, $allowed_keys) )
@@ -2332 +2356 @@
                 }
 
-                $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
-            }
-
-            // append ASC or DESC at the end
-            if ( !empty($q['orderby']))
-                $q['orderby'] .= " {$q['order']}";
-
-            if ( empty($q['orderby']) )
-                $q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
+                $orderby_array[] = $orderby;
+            }
+            $orderby = implode( ',', $orderby_array );
+
+            if ( empty( $orderby ) )
+                $orderby = "$wpdb->posts.post_date ".$q['order'];
+            else
+                $orderby .= " {$q['order']}";
         }
 
@@ -2386 +2409 @@
         }
 
-        if ( isset($q['post_status']) && '' != $q['post_status'] ) {
+        if ( ! empty( $q['post_status'] ) ) {
             $statuswheres = array();
-            $q_status = explode(',', $q['post_status']);
+            $q_status = $q['post_status'];
+            if ( ! is_array( $q_status ) )
+                $q_status = explode(',', $q_status);
             $r_status = array();
             $p_status = array();
             $e_status = array();
-            if ( $q['post_status'] == 'any' ) {
+            if ( in_array('any', $q_status) ) {
                 foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
                     $e_status[] = "$wpdb->posts.post_status <> '$status'";
@@ -2461 +2486 @@
         }
 
-        // 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'];
-        }
-
-        if ( ! empty( $this->tax_query->queries ) || ! empty( $q['meta_query'] ) ) {
-            $groupby = "{$wpdb->posts}.ID";
         }
 
@@ -2542 +2553 @@
                 $where = "AND 0";
         }
-
-        $orderby = $q['orderby'];
 
         $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
@@ -2968 +2977 @@
 
     /**
-     * PHP4 type constructor.
+     * Constructor.
      *
      * Sets up the WordPress query, if parameter is not empty.
@@ -2978 +2987 @@
      * @return WP_Query
      */
-    function WP_Query($query = '') {
+    function __construct($query = '') {
         if ( ! empty($query) ) {
             $this->query($query);
@@ -3510 +3519 @@
             return;
 
-        wp_redirect($link, '301'); // Permanent redirect
+        wp_redirect( $link, 301 ); // Permanent redirect
         exit;
     endif;