Wordpress 3.6-scripts
[autoinstalls/wordpress.git] / wp-includes / query.php
index 0f394f0fa1e0ac44f490f3a061420eb355d7f5f0..04286aa517cfc9fe5b180ae955811ed7503e202a 100644 (file)
@@ -2,8 +2,8 @@
 /**
  * WordPress Query API
  *
- * The query API attempts to get which part of WordPress to the user is on. It
- * also provides functionality to getting URL query information.
+ * The query API attempts to get which part of WordPress the user is on. It
+ * also provides functionality for getting URL query information.
  *
  * @link http://codex.wordpress.org/The_Loop More information on The Loop.
  *
@@ -27,9 +27,8 @@ function get_query_var($var) {
        return $wp_query->get($var);
 }
 
-
 /**
- * Retrieve the currently-queried object.  Wrapper for $wp_query->get_queried_object()
+ * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
  *
  * @uses WP_Query::get_queried_object
  *
@@ -87,9 +86,8 @@ function set_query_var($var, $value) {
  * @param string $query
  * @return array List of posts
  */
-function &query_posts($query) {
-       unset($GLOBALS['wp_query']);
-       $GLOBALS['wp_query'] =& new WP_Query();
+function query_posts($query) {
+       $GLOBALS['wp_query'] = new WP_Query();
        return $GLOBALS['wp_query']->query($query);
 }
 
@@ -104,8 +102,7 @@ function &query_posts($query) {
  * @uses $wp_query
  */
 function wp_reset_query() {
-       unset($GLOBALS['wp_query']);
-       $GLOBALS['wp_query'] =& $GLOBALS['wp_the_query'];
+       $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
        wp_reset_postdata();
 }
 
@@ -129,7 +126,7 @@ function wp_reset_postdata() {
  */
 
 /**
- * Is the query for an archive page?
+ * Is the query for an existing archive page?
  *
  * Month, Year, Category, Author, Post Type archive...
  *
@@ -151,7 +148,7 @@ function is_archive() {
 }
 
 /**
- * Is the query for a post type archive page?
+ * Is the query for an existing post type archive page?
  *
  * @see WP_Query::is_post_type_archive()
  * @since 3.1.0
@@ -172,7 +169,7 @@ function is_post_type_archive( $post_types = '' ) {
 }
 
 /**
- * Is the query for an attachment page?
+ * Is the query for an existing attachment page?
  *
  * @see WP_Query::is_attachment()
  * @since 2.0.0
@@ -192,7 +189,7 @@ function is_attachment() {
 }
 
 /**
- * Is the query for an author archive page?
+ * Is the query for an existing author archive page?
  *
  * If the $author parameter is specified, this function will additionally
  * check if the query is for one of the authors specified.
@@ -216,7 +213,7 @@ function is_author( $author = '' ) {
 }
 
 /**
- * Is the query for a category archive page?
+ * Is the query for an existing category archive page?
  *
  * If the $category parameter is specified, this function will additionally
  * check if the query is for one of the categories specified.
@@ -240,7 +237,7 @@ function is_category( $category = '' ) {
 }
 
 /**
- * Is the query for a tag archive page?
+ * Is the query for an existing tag archive page?
  *
  * If the $tag parameter is specified, this function will additionally
  * check if the query is for one of the tags specified.
@@ -264,7 +261,7 @@ function is_tag( $slug = '' ) {
 }
 
 /**
- * Is the query for a taxonomy archive page?
+ * Is the query for an existing taxonomy archive page?
  *
  * If the $taxonomy parameter is specified, this function will additionally
  * check if the query is for that specific $taxonomy.
@@ -313,7 +310,7 @@ function is_comments_popup() {
 }
 
 /**
- * Is the query for a date archive?
+ * Is the query for an existing date archive?
  *
  * @see WP_Query::is_date()
  * @since 1.5.0
@@ -333,7 +330,7 @@ function is_date() {
 }
 
 /**
- * Is the query for a day archive?
+ * Is the query for an existing day archive?
  *
  * @see WP_Query::is_day()
  * @since 1.5.0
@@ -453,7 +450,7 @@ function is_home() {
 }
 
 /**
- * Is the query for a month archive?
+ * Is the query for an existing month archive?
  *
  * @see WP_Query::is_month()
  * @since 1.5.0
@@ -473,7 +470,7 @@ function is_month() {
 }
 
 /**
- * Is the query for a single page?
+ * Is the query for an existing single page?
  *
  * If the $page parameter is specified, this function will additionally
  * check if the query is for one of the pages specified.
@@ -580,7 +577,7 @@ function is_search() {
 }
 
 /**
- * Is the query for a single post?
+ * Is the query for an existing single post?
  *
  * Works for any post type, except attachments and pages
  *
@@ -609,7 +606,7 @@ function is_single( $post = '' ) {
 }
 
 /**
- * Is the query for a single post of any post type (post, attachment, page, ... )?
+ * Is the query for an existing single post of any post type (post, attachment, page, ... )?
  *
  * If the $post_types parameter is specified, this function will additionally
  * check if the query is for one of the Posts Types specified.
@@ -676,7 +673,7 @@ function is_trackback() {
 }
 
 /**
- * Is the query for a specific year?
+ * Is the query for an existing year archive?
  *
  * @see WP_Query::is_year()
  * @since 1.5.0
@@ -715,8 +712,20 @@ function is_404() {
        return $wp_query->is_404();
 }
 
+/**
+ * Is the query the main query?
+ *
+ * @since 3.3.0
+ *
+ * @return bool
+ */
+function is_main_query() {
+       global $wp_query;
+       return $wp_query->is_main_query();
+}
+
 /*
- * The Loop.  Post loop control.
+ * The Loop. Post loop control.
  */
 
 /**
@@ -848,6 +857,15 @@ class WP_Query {
         */
        var $tax_query;
 
+       /**
+        * 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.
         *
@@ -959,7 +977,9 @@ class WP_Query {
        var $comment;
 
        /**
-        * Amount of posts if limit clause was not used.
+        * The amount of found posts for the current query.
+        *
+        * If limit clause was not used, equals $post_count.
         *
         * @since 2.1.0
         * @access public
@@ -1231,13 +1251,31 @@ class WP_Query {
        var $is_post_type_archive = false;
 
        /**
-        * Whether the tax query has been parsed once.
+        * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know
+        * whether we have to re-parse because something has changed
         *
         * @since 3.1.0
         * @access private
+        */
+       var $query_vars_hash = false;
+
+       /**
+        * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
+        * via pre_get_posts hooks.
+        *
+        * @since 3.1.1
+        * @access private
+        */
+       var $query_vars_changed = true;
+
+       /**
+        * Set if post thumbnails are cached
+        *
+        * @since 3.2.0
+        * @access public
         * @var bool
         */
-       var $parsed_tax_query = false;
+        var $thumbnails_cached = false;
 
        /**
         * Resets query flags to false.
@@ -1360,6 +1398,7 @@ class WP_Query {
                        , 's'
                        , 'sentence'
                        , 'fields'
+                       , 'menu_order'
                );
 
                foreach ( $keys as $key ) {
@@ -1367,8 +1406,8 @@ class WP_Query {
                                $array[$key] = '';
                }
 
-               $array_keys = array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in',
-                       'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and');
+               $array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in',
+                       'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in' );
 
                foreach ( $array_keys as $key ) {
                        if ( !isset($array[$key]) )
@@ -1395,6 +1434,7 @@ class WP_Query {
 
                $this->query_vars = $this->fill_query_vars($this->query_vars);
                $qv = &$this->query_vars;
+               $this->query_vars_changed = true;
 
                if ( ! empty($qv['robots']) )
                        $this->is_robots = true;
@@ -1413,8 +1453,9 @@ class WP_Query {
                if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
                if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
                if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
+               if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
 
-               // Compat.  Map subpost to attachment.
+               // Compat. Map subpost to attachment.
                if ( '' != $qv['subpost'] )
                        $qv['attachment'] = $qv['subpost'];
                if ( '' != $qv['subpost_id'] )
@@ -1437,7 +1478,7 @@ class WP_Query {
                        $this->is_page = true;
                        $this->is_single = false;
                } else {
-               // Look for archive queries.  Dates, categories, authors, search, post type archives.
+               // Look for archive queries. Dates, categories, authors, search, post type archives.
 
                        if ( !empty($qv['s']) ) {
                                $this->is_search = true;
@@ -1496,11 +1537,11 @@ class WP_Query {
                                $this->is_date = true;
                        }
 
-                       $this->parsed_tax_query = false;
+                       $this->query_vars_hash = false;
                        $this->parse_tax_query( $qv );
 
                        foreach ( $this->tax_query->queries as $tax_query ) {
-                               if ( 'IN' == $tax_query['operator'] ) {
+                               if ( 'NOT IN' != $tax_query['operator'] ) {
                                        switch ( $tax_query['taxonomy'] ) {
                                                case 'category':
                                                        $this->is_category = true;
@@ -1515,8 +1556,6 @@ class WP_Query {
                        }
                        unset( $tax_query );
 
-                       _parse_meta_query( $qv );
-
                        if ( empty($qv['author']) || ($qv['author'] == '0') ) {
                                $this->is_author = false;
                        } else {
@@ -1587,7 +1626,7 @@ class WP_Query {
                }
 
                if ( '' != $qv['pagename'] ) {
-                       $this->queried_object =& get_page_by_path($qv['pagename']);
+                       $this->queried_object = get_page_by_path($qv['pagename']);
                        if ( !empty($this->queried_object) )
                                $this->queried_object_id = (int) $this->queried_object->ID;
                        else
@@ -1615,8 +1654,12 @@ class WP_Query {
                                $qv['post_type'] = sanitize_key($qv['post_type']);
                }
 
-               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'] ) )
                        $this->is_comment_feed = false;
@@ -1627,6 +1670,9 @@ class WP_Query {
                if ( '404' == $qv['error'] )
                        $this->set_404();
 
+               $this->query_vars_hash = md5( serialize( $this->query_vars ) );
+               $this->query_vars_changed = false;
+
                do_action_ref_array('parse_query', array(&$this));
        }
 
@@ -1654,6 +1700,9 @@ class WP_Query {
                }
 
                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+                       if ( 'post_tag' == $taxonomy )
+                               continue;       // Handled further down in the $q['tag'] block
+
                        if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
                                $tax_query_defaults = array(
                                        'taxonomy' => $taxonomy,
@@ -1682,7 +1731,7 @@ class WP_Query {
                }
 
                // Category stuff
-               if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
+               if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
                        $q['cat'] = ''.urldecode($q['cat']).'';
                        $q['cat'] = addslashes_gpc($q['cat']);
                        $cat_array = preg_split('/[,\s]+/', $q['cat']);
@@ -1736,15 +1785,15 @@ class WP_Query {
                }
 
                // Tag stuff
-               if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
+               if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
                        if ( strpos($q['tag'], ',') !== false ) {
-                               $tags = preg_split('/[,\s]+/', $q['tag']);
+                               $tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
                                foreach ( (array) $tags as $tag ) {
                                        $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                                        $q['tag_slug__in'][] = $tag;
                                }
-                       } else if ( preg_match('/[+\s]+/', $q['tag']) || !empty($q['cat']) ) {
-                               $tags = preg_split('/[+\s]+/', $q['tag']);
+                       } else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) {
+                               $tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
                                foreach ( (array) $tags as $tag ) {
                                        $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                                        $q['tag_slug__and'][] = $tag;
@@ -1790,7 +1839,7 @@ class WP_Query {
                }
 
                if ( !empty($q['tag_slug__in']) ) {
-                       $q['tag_slug__in'] = array_map('sanitize_title', (array) $q['tag_slug__in']);
+                       $q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
                        $tax_query[] = array(
                                'taxonomy' => 'post_tag',
                                'terms' => $q['tag_slug__in'],
@@ -1799,7 +1848,7 @@ class WP_Query {
                }
 
                if ( !empty($q['tag_slug__and']) ) {
-                       $q['tag_slug__and'] = array_map('sanitize_title', (array) $q['tag_slug__and']);
+                       $q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
                        $tax_query[] = array(
                                'taxonomy' => 'post_tag',
                                'terms' => $q['tag_slug__and'],
@@ -1808,8 +1857,6 @@ class WP_Query {
                        );
                }
 
-               $this->parsed_tax_query = true;
-
                $this->tax_query = new WP_Tax_Query( $tax_query );
        }
 
@@ -1869,7 +1916,7 @@ class WP_Query {
         *
         * @return array List of posts.
         */
-       function &get_posts() {
+       function get_posts() {
                global $wpdb, $user_ID, $_wp_using_ext_object_cache;
 
                $this->parse_query();
@@ -1879,8 +1926,21 @@ class WP_Query {
                // Shorthand.
                $q = &$this->query_vars;
 
+               // Fill again in case pre_get_posts unset some vars.
                $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 ) );
+               if ( $hash != $this->query_vars_hash ) {
+                       $this->query_vars_changed = true;
+                       $this->query_vars_hash = $hash;
+               }
+               unset($hash);
+
                // First let's clear some variables
                $distinct = '';
                $whichauthor = '';
@@ -1982,6 +2042,9 @@ class WP_Query {
                                $fields = "$wpdb->posts.*";
                }
 
+               if ( '' !== $q['menu_order'] )
+                       $where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+
                // If a month is specified in the querystring, load that month
                if ( $q['m'] ) {
                        $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
@@ -2016,7 +2079,7 @@ class WP_Query {
                if ( $q['day'] )
                        $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
 
-               // If we've got a post_type AND its not "any" post_type.
+               // If we've got a post_type AND it's not "any" post_type.
                if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
                        foreach ( (array)$q['post_type'] as $_post_type ) {
                                $ptype_obj = get_post_type_object($_post_type);
@@ -2070,7 +2133,7 @@ class WP_Query {
                                $q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
                                $q['name'] = $q['pagename'];
                                $where .= " AND ($wpdb->posts.ID = '$reqpage')";
-                               $reqpage_obj = get_page($reqpage);
+                               $reqpage_obj = get_post( $reqpage );
                                if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
                                        $this->is_attachment = true;
                                        $post_type = $q['post_type'] = 'attachment';
@@ -2090,7 +2153,7 @@ class WP_Query {
                if ( intval($q['comments_popup']) )
                        $q['p'] = absint($q['comments_popup']);
 
-               // If an attachment is requested by number, let it supercede any post number.
+               // If an attachment is requested by number, let it supersede any post number.
                if ( $q['attachment_id'] )
                        $q['p'] = absint($q['attachment_id']);
 
@@ -2105,8 +2168,15 @@ class WP_Query {
                        $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
                }
 
-               if ( is_numeric($q['post_parent']) )
+               if ( is_numeric( $q['post_parent'] ) ) {
                        $where .= $wpdb->prepare( " AND $wpdb->posts.post_parent = %d ", $q['post_parent'] );
+               } elseif ( $q['post_parent__in'] ) {
+                       $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
+                       $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
+               } elseif ( $q['post_parent__not_in'] ) {
+                       $post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
+                       $where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
+               }
 
                if ( $q['page_id'] ) {
                        if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
@@ -2119,10 +2189,12 @@ class WP_Query {
                if ( !empty($q['s']) ) {
                        // added slashes screw with quote grouping when done early, so done later
                        $q['s'] = stripslashes($q['s']);
+                       if ( empty( $_GET['s'] ) && $this->is_main_query() )
+                               $q['s'] = urldecode($q['s']);
                        if ( !empty($q['sentence']) ) {
                                $q['search_terms'] = array($q['s']);
                        } else {
-                               preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches);
+                               preg_match_all('/".*?("|$)|((?<=[\r\n\t ",+])|^)[^\r\n\t ",+]+/', $q['s'], $matches);
                                $q['search_terms'] = array_map('_search_terms_tidy', $matches[0]);
                        }
                        $n = !empty($q['exact']) ? '' : '%';
@@ -2132,9 +2204,6 @@ class WP_Query {
                                $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
                                $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) ) {
                                $search = " AND ({$search}) ";
@@ -2147,16 +2216,30 @@ class WP_Query {
                $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
 
                // Taxonomies
-               $this->parse_tax_query( $q );
+               if ( !$this->is_singular ) {
+                       $this->parse_tax_query( $q );
 
-               $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+                       $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
 
-               $join .= $clauses['join'];
-               $where .= $clauses['where'];
+                       $join .= $clauses['join'];
+                       $where .= $clauses['where'];
+               }
 
                if ( $this->is_tax ) {
                        if ( empty($post_type) ) {
-                               $post_type = 'any';
+                               // Do a fully inclusive search for currently registered post types of queried taxonomies
+                               $post_type = array();
+                               $taxonomies = wp_list_pluck( $this->tax_query->queries, 'taxonomy' );
+                               foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
+                                       $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
+                                       if ( array_intersect( $taxonomies, $object_taxonomies ) )
+                                               $post_type[] = $pt;
+                               }
+                               if ( ! $post_type )
+                                       $post_type = 'any';
+                               elseif ( count( $post_type ) == 1 )
+                                       $post_type = $post_type[0];
+
                                $post_status_join = true;
                        } elseif ( in_array('attachment', (array) $post_type) ) {
                                $post_status_join = true;
@@ -2182,31 +2265,36 @@ class WP_Query {
                                }
 
                                $cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) );
-                               if ( !empty( $cat_query ) ) {
+                               if ( ! empty( $cat_query ) ) {
                                        $cat_query = reset( $cat_query );
-                                       $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
-                                       if ( $the_cat ) {
-                                               $this->set( 'cat', $the_cat->term_id );
-                                               $this->set( 'category_name', $the_cat->slug );
+
+                                       if ( ! empty( $cat_query['terms'][0] ) ) {
+                                               $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
+                                               if ( $the_cat ) {
+                                                       $this->set( 'cat', $the_cat->term_id );
+                                                       $this->set( 'category_name', $the_cat->slug );
+                                               }
+                                               unset( $the_cat );
                                        }
-                                       unset( $the_cat );
                                }
                                unset( $cat_query );
 
                                $tag_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'post_tag' ) );
-                               if ( !empty( $tag_query ) ) {
+                               if ( ! empty( $tag_query ) ) {
                                        $tag_query = reset( $tag_query );
-                                       $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
-                                       if ( $the_tag ) {
-                                               $this->set( 'tag_id', $the_tag->term_id );
+
+                                       if ( ! empty( $tag_query['terms'][0] ) ) {
+                                               $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
+                                               if ( $the_tag )
+                                                       $this->set( 'tag_id', $the_tag->term_id );
+                                               unset( $the_tag );
                                        }
-                                       unset( $the_tag );
                                }
                                unset( $tag_query );
                        }
                }
 
-               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";
                }
 
@@ -2242,7 +2330,7 @@ class WP_Query {
                                if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
                                        $q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
                                } else {
-                                       $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailling slash
+                                       $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
                                }
                        }
                        $q['author_name'] = sanitize_title_for_query( $q['author_name'] );
@@ -2254,10 +2342,8 @@ class WP_Query {
 
                // MIME-Type stuff for attachment browsing
 
-               if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] ) {
-                       $table_alias = $post_status_join ? $wpdb->posts : '';
-                       $whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $table_alias);
-               }
+               if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] )
+                       $whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
 
                $where .= $search . $whichauthor . $whichmimetype;
 
@@ -2266,12 +2352,16 @@ class WP_Query {
 
                // 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 = '';
+               } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
+                       $orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
+               } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
+                       $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
                } else {
                        // Used to filter values
-                       $allowed_keys = array('author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
+                       $allowed_keys = array('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
                        if ( !empty($q['meta_key']) ) {
                                $allowed_keys[] = $q['meta_key'];
                                $allowed_keys[] = 'meta_value';
@@ -2279,16 +2369,16 @@ class WP_Query {
                        }
                        $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) )
                                        continue;
 
                                switch ( $orderby ) {
                                        case 'menu_order':
+                                               $orderby = "$wpdb->posts.menu_order";
                                                break;
                                        case 'ID':
                                                $orderby = "$wpdb->posts.ID";
@@ -2310,32 +2400,30 @@ class WP_Query {
                                                $orderby = "$wpdb->posts.post_" . $orderby;
                                }
 
-                               $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
+                               $orderby_array[] = $orderby;
                        }
+                       $orderby = implode( ',', $orderby_array );
 
-                       // 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'];
+                       if ( empty( $orderby ) )
+                               $orderby = "$wpdb->posts.post_date ".$q['order'];
+                       else
+                               $orderby .= " {$q['order']}";
                }
 
-               if ( is_array( $post_type ) ) {
+               if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
                        $post_type_cap = 'multiple_post_type';
                } else {
+                       if ( is_array( $post_type ) )
+                               $post_type = reset( $post_type );
                        $post_type_object = get_post_type_object( $post_type );
                        if ( empty( $post_type_object ) )
                                $post_type_cap = $post_type;
                }
 
-               $exclude_post_types = '';
-               $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-               if ( ! empty( $in_search_post_types ) )
-                       $exclude_post_types .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
-
                if ( 'any' == $post_type ) {
-                       $where .= $exclude_post_types;
+                       $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
+                       if ( ! empty( $in_search_post_types ) )
+                               $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
                } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
                        $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
                } elseif ( ! empty( $post_type ) ) {
@@ -2352,25 +2440,26 @@ class WP_Query {
                        $post_type_object = get_post_type_object ( 'post' );
                }
 
+               $edit_cap = 'edit_post';
+               $read_cap = 'read_post';
+
                if ( ! empty( $post_type_object ) ) {
-                       $edit_cap = $post_type_object->cap->edit_post;
-                       $read_cap = $post_type_object->cap->read_post;
                        $edit_others_cap = $post_type_object->cap->edit_others_posts;
                        $read_private_cap = $post_type_object->cap->read_private_posts;
                } else {
-                       $edit_cap = 'edit_' . $post_type_cap;
-                       $read_cap = 'read_' . $post_type_cap;
                        $edit_others_cap = 'edit_others_' . $post_type_cap . 's';
                        $read_private_cap = 'read_private_' . $post_type_cap . 's';
                }
 
-               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'";
                        } else {
@@ -2394,13 +2483,13 @@ class WP_Query {
                        }
                        if ( !empty($r_status) ) {
                                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
-                                       $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $r_status ) . "))";
+                                       $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
                                else
                                        $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
                        }
                        if ( !empty($p_status) ) {
                                if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
-                                       $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $p_status ) . "))";
+                                       $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
                                else
                                        $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
                        }
@@ -2422,7 +2511,7 @@ class WP_Query {
                                $where .= " OR $wpdb->posts.post_status = '$state'";
                        }
 
-                       if ( is_admin() ) {
+                       if ( $this->is_admin ) {
                                // Add protected states that should show in the admin all list.
                                $admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
                                foreach ( (array) $admin_all_states as $state )
@@ -2439,8 +2528,8 @@ class WP_Query {
                        $where .= ')';
                }
 
-               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'];
                }
@@ -2455,18 +2544,16 @@ class WP_Query {
                // Paging
                if ( empty($q['nopaging']) && !$this->is_singular ) {
                        $page = absint($q['paged']);
-                       if ( empty($page) )
+                       if ( !$page )
                                $page = 1;
 
                        if ( empty($q['offset']) ) {
-                               $pgstrt = '';
                                $pgstrt = ($page - 1) * $q['posts_per_page'] . ', ';
-                               $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
                        } else { // we're ignoring $page and using 'offset'
                                $q['offset'] = absint($q['offset']);
                                $pgstrt = $q['offset'] . ', ';
-                               $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
                        }
+                       $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
                }
 
                // Comments feeds
@@ -2507,11 +2594,9 @@ class WP_Query {
                                $where = "AND 0";
                }
 
-               $orderby = $q['orderby'];
-
                $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
 
-               // Apply post-paging filters on where and join.  Only plugins that
+               // Apply post-paging filters on where and join. Only plugins that
                // manipulate paging queries should use these hooks.
                if ( !$q['suppress_filters'] ) {
                        $where          = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
@@ -2528,10 +2613,10 @@ class WP_Query {
                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
                }
 
-               // Announce current selection parameters.  For use by caching plugins.
+               // Announce current selection parameters. For use by caching plugins.
                do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
 
-               // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
+               // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
                if ( !$q['suppress_filters'] ) {
                        $where          = apply_filters_ref_array( 'posts_where_request',               array( $where, &$this ) );
                        $groupby        = apply_filters_ref_array( 'posts_groupby_request',             array( $groupby, &$this ) );
@@ -2556,18 +2641,24 @@ class WP_Query {
                if ( !$q['no_found_rows'] && !empty($limits) )
                        $found_rows = 'SQL_CALC_FOUND_ROWS';
 
-               $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
-               if ( !$q['suppress_filters'] )
-                       $this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) );
+               $this->request = $old_request = "SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+
+               if ( !$q['suppress_filters'] ) {
+                       $this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+               }
 
                if ( 'ids' == $q['fields'] ) {
-                       $this->posts = $wpdb->get_col($this->request);
+                       $this->posts = $wpdb->get_col( $this->request );
+                       $this->post_count = count( $this->posts );
+                       $this->set_found_posts( $q, $limits );
 
                        return $this->posts;
                }
 
                if ( 'id=>parent' == $q['fields'] ) {
-                       $this->posts = $wpdb->get_results($this->request);
+                       $this->posts = $wpdb->get_results( $this->request );
+                       $this->post_count = count( $this->posts );
+                       $this->set_found_posts( $q, $limits );
 
                        $r = array();
                        foreach ( $this->posts as $post )
@@ -2576,9 +2667,35 @@ class WP_Query {
                        return $r;
                }
 
-               $this->posts = $wpdb->get_results($this->request);
+               $split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+               $split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+
+               if ( $split_the_query ) {
+                       // First get the IDs and then fill in the objects
+
+                       $this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+
+                       $this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+
+                       $ids = $wpdb->get_col( $this->request );
+
+                       if ( $ids ) {
+                               $this->posts = $ids;
+                               $this->set_found_posts( $q, $limits );
+                               _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+                       } else {
+                               $this->posts = array();
+                       }
+               } else {
+                       $this->posts = $wpdb->get_results( $this->request );
+                       $this->set_found_posts( $q, $limits );
+               }
+
+               // Convert to WP_Post objects
+               if ( $this->posts )
+                       $this->posts = array_map( 'get_post', $this->posts );
 
-               // Raw results filter.  Prior to status checks.
+               // Raw results filter. Prior to status checks.
                if ( !$q['suppress_filters'] )
                        $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
 
@@ -2595,13 +2712,6 @@ class WP_Query {
                        $this->comment_count = count($this->comments);
                }
 
-               if ( !$q['no_found_rows'] && !empty($limits) ) {
-                       $found_posts_query = apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) );
-                       $this->found_posts = $wpdb->get_var( $found_posts_query );
-                       $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
-                       $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
-               }
-
                // Check post status to determine if post should be displayed.
                if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
                        $status = get_post_status($this->posts[0]);
@@ -2630,8 +2740,8 @@ class WP_Query {
                                }
                        }
 
-                       if ( $this->is_preview && current_user_can( $edit_cap, $this->posts[0]->ID ) )
-                               $this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], &$this ));
+                       if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) )
+                               $this->posts[0] = get_post( apply_filters_ref_array( 'the_preview', array( $this->posts[0], &$this ) ) );
                }
 
                // Put sticky posts at the top of the posts array
@@ -2647,7 +2757,7 @@ class WP_Query {
                                        array_splice($this->posts, $i, 1);
                                        // Move to front, after other stickies
                                        array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
-                                       // Increment the sticky offset.  The next sticky will be placed at this offset.
+                                       // Increment the sticky offset. The next sticky will be placed at this offset.
                                        $sticky_offset++;
                                        // Remove post from sticky posts array
                                        $offset = array_search($sticky_post->ID, $sticky_posts);
@@ -2661,24 +2771,15 @@ class WP_Query {
 
                        // Fetch sticky posts that weren't in the query results
                        if ( !empty($sticky_posts) ) {
-                               $stickies__in = implode(',', array_map( 'absint', $sticky_posts ));
-                               // honor post type(s) if not set to any
-                               $stickies_where = '';
-                               if ( 'any' != $post_type && '' != $post_type ) {
-                                       if ( is_array( $post_type ) ) {
-                                               $post_types = join( "', '", $post_type );
-                                       } else {
-                                               $post_types = $post_type;
-                                       }
-                                       $stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')";
-                               }
+                               $stickies = get_posts( array(
+                                       'post__in' => $sticky_posts,
+                                       'post_type' => $post_type,
+                                       'post_status' => 'publish',
+                                       'nopaging' => true
+                               ) );
 
-                               $stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" );
                                foreach ( $stickies as $sticky_post ) {
-                                       // Ignore sticky posts the current user cannot read or are not published.
-                                       if ( 'publish' != $sticky_post->post_status )
-                                               continue;
-                                       array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
+                                       array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
                                        $sticky_offset++;
                                }
                        }
@@ -2687,30 +2788,58 @@ class WP_Query {
                if ( !$q['suppress_filters'] )
                        $this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) );
 
-               $this->post_count = count($this->posts);
+               // Ensure that any posts added/modified via one of the filters above are
+               // of the type WP_Post and are filtered.
+               if ( $this->posts ) {
+                       $this->post_count = count( $this->posts );
 
-               // Sanitize before caching so it'll only get done once
-               for ( $i = 0; $i < $this->post_count; $i++ ) {
-                       $this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
-               }
+                       $this->posts = array_map( 'get_post', $this->posts );
 
-               if ( $q['cache_results'] )
-                       update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+                       if ( $q['cache_results'] )
+                               update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 
-               if ( $this->post_count > 0 ) {
-                       $this->post = $this->posts[0];
+                       $this->post = reset( $this->posts );
+               } else {
+                       $this->post_count = 0;
+                       $this->posts = array();
                }
 
                return $this->posts;
        }
 
+       /**
+        * Set up the amount of found posts and the number of pages (if limit clause was used)
+        * for the current query.
+        *
+        * @since 3.5.0
+        * @access private
+        */
+       function set_found_posts( $q, $limits ) {
+               global $wpdb;
+
+               // Bail if posts is an empty array. Continue if posts is an empty string,
+               // null, or false to accommodate caching plugins that fill posts later.
+               if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+                       return;
+
+               if ( ! empty( $limits ) )
+                       $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
+               else
+                       $this->found_posts = count( $this->posts );
+
+               $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+
+               if ( ! empty( $limits ) )
+                       $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+       }
+
        /**
         * Set up the next post and iterate current post index.
         *
         * @since 1.5.0
         * @access public
         *
-        * @return object Next post.
+        * @return WP_Post Next post.
         */
        function next_post() {
 
@@ -2854,7 +2983,7 @@ class WP_Query {
         * @param string $query URL query string.
         * @return array List of posts.
         */
-       function &query( $query ) {
+       function query( $query ) {
                $this->init();
                $this->query = $this->query_vars = wp_parse_args( $query );
                return $this->get_posts();
@@ -2876,7 +3005,7 @@ class WP_Query {
                if ( isset($this->queried_object) )
                        return $this->queried_object;
 
-               $this->queried_object = NULL;
+               $this->queried_object = null;
                $this->queried_object_id = 0;
 
                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
@@ -2886,18 +3015,21 @@ class WP_Query {
 
                        if ( 'term_id' == $query['field'] )
                                $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-                       else
+                       elseif ( $query['terms'] )
                                $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
 
-                       if ( $term && ! is_wp_error($term) )  {
+                       if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
                                $this->queried_object = $term;
                                $this->queried_object_id = (int) $term->term_id;
+
+                               if ( $this->is_category )
+                                       _make_cat_compat( $this->queried_object );
                        }
                } elseif ( $this->is_post_type_archive ) {
                        $this->queried_object = get_post_type_object( $this->get('post_type') );
                } elseif ( $this->is_posts_page ) {
                        $page_for_posts = get_option('page_for_posts');
-                       $this->queried_object = & get_page( $page_for_posts );
+                       $this->queried_object = get_post( $page_for_posts );
                        $this->queried_object_id = (int) $this->queried_object->ID;
                } elseif ( $this->is_singular && !is_null($this->post) ) {
                        $this->queried_object = $this->post;
@@ -2929,7 +3061,7 @@ class WP_Query {
        }
 
        /**
-        * PHP4 type constructor.
+        * Constructor.
         *
         * Sets up the WordPress query, if parameter is not empty.
         *
@@ -2939,14 +3071,14 @@ class WP_Query {
         * @param string $query URL query string.
         * @return WP_Query
         */
-       function WP_Query($query = '') {
+       function __construct($query = '') {
                if ( ! empty($query) ) {
                        $this->query($query);
                }
        }
 
        /**
-        * Is the query for an archive page?
+        * Is the query for an existing archive page?
         *
         * Month, Year, Category, Author, Post Type archive...
         *
@@ -2959,7 +3091,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a post type archive page?
+        * Is the query for an existing post type archive page?
         *
         * @since 3.1.0
         *
@@ -2976,7 +3108,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for an attachment page?
+        * Is the query for an existing attachment page?
         *
         * @since 3.1.0
         *
@@ -2987,7 +3119,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for an author archive page?
+        * Is the query for an existing author archive page?
         *
         * If the $author parameter is specified, this function will additionally
         * check if the query is for one of the authors specified.
@@ -3019,7 +3151,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a category archive page?
+        * Is the query for an existing category archive page?
         *
         * If the $category parameter is specified, this function will additionally
         * check if the query is for one of the categories specified.
@@ -3051,7 +3183,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a tag archive page?
+        * Is the query for an existing tag archive page?
         *
         * If the $tag parameter is specified, this function will additionally
         * check if the query is for one of the tags specified.
@@ -3079,7 +3211,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a taxonomy archive page?
+        * Is the query for an existing taxonomy archive page?
         *
         * If the $taxonomy parameter is specified, this function will additionally
         * check if the query is for that specific $taxonomy.
@@ -3107,8 +3239,13 @@ class WP_Query {
                $tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
                $term_array = (array) $term;
 
-               if ( empty( $term ) ) // Only a Taxonomy provided
-                       return isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array );
+               // Check that the taxonomy matches.
+               if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+                       return false;
+
+               // Only a Taxonomy provided.
+               if ( empty( $term ) )
+                       return true;
 
                return isset( $queried_object->term_id ) &&
                        count( array_intersect(
@@ -3129,7 +3266,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a date archive?
+        * Is the query for an existing date archive?
         *
         * @since 3.1.0
         *
@@ -3139,9 +3276,8 @@ class WP_Query {
                return (bool) $this->is_date;
        }
 
-
        /**
-        * Is the query for a day archive?
+        * Is the query for an existing day archive?
         *
         * @since 3.1.0
         *
@@ -3228,7 +3364,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a month archive?
+        * Is the query for an existing month archive?
         *
         * @since 3.1.0
         *
@@ -3239,7 +3375,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a single page?
+        * Is the query for an existing single page?
         *
         * If the $page parameter is specified, this function will additionally
         * check if the query is for one of the pages specified.
@@ -3318,7 +3454,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a single post?
+        * Is the query for an existing single post?
         *
         * Works for any post type, except attachments and pages
         *
@@ -3355,7 +3491,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a single post of any post type (post, attachment, page, ... )?
+        * Is the query for an existing single post of any post type (post, attachment, page, ... )?
         *
         * If the $post_types parameter is specified, this function will additionally
         * check if the query is for one of the Posts Types specified.
@@ -3400,7 +3536,7 @@ class WP_Query {
        }
 
        /**
-        * Is the query for a specific year?
+        * Is the query for an existing year archive?
         *
         * @since 3.1.0
         *
@@ -3420,6 +3556,18 @@ class WP_Query {
        function is_404() {
                return (bool) $this->is_404;
        }
+
+       /**
+        * Is the query the main query?
+        *
+        * @since 3.3.0
+        *
+        * @return bool
+        */
+       function is_main_query() {
+               global $wp_the_query;
+               return $wp_the_query === $this;
+       }
 }
 
 /**
@@ -3446,6 +3594,12 @@ function wp_old_slug_redirect() {
                else
                        $post_type = 'post';
 
+               if ( is_array( $post_type ) ) {
+                       if ( count( $post_type ) > 1 )
+                               return;
+                       $post_type = array_shift( $post_type );
+               }
+
                // Do not attempt redirect for hierarchical post types
                if ( is_post_type_hierarchical( $post_type ) )
                        return;
@@ -3471,7 +3625,7 @@ function wp_old_slug_redirect() {
                if ( !$link )
                        return;
 
-               wp_redirect($link, '301'); // Permanent redirect
+               wp_redirect( $link, 301 ); // Permanent redirect
                exit;
        endif;
 }
@@ -3485,7 +3639,7 @@ function wp_old_slug_redirect() {
  * @uses do_action_ref_array() Calls 'the_post'
  * @return bool True when finished.
  */
-function setup_postdata($post) {
+function setup_postdata( $post ) {
        global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
        $id = (int) $post->ID;
@@ -3495,28 +3649,31 @@ function setup_postdata($post) {
        $currentday = mysql2date('d.m.y', $post->post_date, false);
        $currentmonth = mysql2date('m', $post->post_date, false);
        $numpages = 1;
+       $multipage = 0;
        $page = get_query_var('page');
-       if ( !$page )
+       if ( ! $page )
                $page = 1;
        if ( is_single() || is_page() || is_feed() )
                $more = 1;
        $content = $post->post_content;
-       if ( strpos( $content, '<!--nextpage-->' ) ) {
+       if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
                if ( $page > 1 )
                        $more = 1;
-               $multipage = 1;
-               $content = str_replace("\n<!--nextpage-->\n", '<!--nextpage-->', $content);
-               $content = str_replace("\n<!--nextpage-->", '<!--nextpage-->', $content);
-               $content = str_replace("<!--nextpage-->\n", '<!--nextpage-->', $content);
+               $content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
+               $content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
+               $content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
+               // Ignore nextpage at the beginning of the content.
+               if ( 0 === strpos( $content, '<!--nextpage-->' ) )
+                       $content = substr( $content, 15 );
                $pages = explode('<!--nextpage-->', $content);
                $numpages = count($pages);
+               if ( $numpages > 1 )
+                       $multipage = 1;
        } else {
                $pages = array( $post->post_content );
-               $multipage = 0;
        }
 
        do_action_ref_array('the_post', array(&$post));
 
        return true;
 }
-?>