WordPress 3.8.2
[autoinstalls/wordpress.git] / wp-includes / query.php
index 5f6ccddfb8a10a1b0e302f5ac74b561f03cff199..446cebca0d83de1d140e87bed534c72e92b28651 100644 (file)
@@ -2,8 +2,8 @@
 /**
  * WordPress Query API
  *
 /**
  * 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.
  *
  *
  * @link http://codex.wordpress.org/The_Loop More information on The Loop.
  *
@@ -86,8 +86,7 @@ function set_query_var($var, $value) {
  * @param string $query
  * @return array List of posts
  */
  * @param string $query
  * @return array List of posts
  */
-function &query_posts($query) {
-       unset($GLOBALS['wp_query']);
+function query_posts($query) {
        $GLOBALS['wp_query'] = new WP_Query();
        return $GLOBALS['wp_query']->query($query);
 }
        $GLOBALS['wp_query'] = new WP_Query();
        return $GLOBALS['wp_query']->query($query);
 }
@@ -103,23 +102,22 @@ function &query_posts($query) {
  * @uses $wp_query
  */
 function wp_reset_query() {
  * @uses $wp_query
  */
 function wp_reset_query() {
-       unset($GLOBALS['wp_query']);
        $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
        wp_reset_postdata();
 }
 
 /**
  * After looping through a separate query, this function restores
        $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
        wp_reset_postdata();
 }
 
 /**
  * After looping through a separate query, this function restores
- * the $post global to the current post in the main query
+ * the $post global to the current post in the main query.
  *
  * @since 3.0.0
  * @uses $wp_query
  */
 function wp_reset_postdata() {
        global $wp_query;
  *
  * @since 3.0.0
  * @uses $wp_query
  */
 function wp_reset_postdata() {
        global $wp_query;
-       if ( !empty($wp_query->post) ) {
-               $GLOBALS['post'] = $wp_query->post;
-               setup_postdata($wp_query->post);
+
+       if ( isset( $wp_query ) ) {
+               $wp_query->reset_postdata();
        }
 }
 
        }
 }
 
@@ -128,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...
  *
  *
  * Month, Year, Category, Author, Post Type archive...
  *
@@ -150,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
  *
  * @see WP_Query::is_post_type_archive()
  * @since 3.1.0
@@ -171,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
  *
  * @see WP_Query::is_attachment()
  * @since 2.0.0
@@ -191,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.
  *
  * If the $author parameter is specified, this function will additionally
  * check if the query is for one of the authors specified.
@@ -215,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.
  *
  * If the $category parameter is specified, this function will additionally
  * check if the query is for one of the categories specified.
@@ -239,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.
  *
  * If the $tag parameter is specified, this function will additionally
  * check if the query is for one of the tags specified.
@@ -248,10 +246,10 @@ function is_category( $category = '' ) {
  * @since 2.3.0
  * @uses $wp_query
  *
  * @since 2.3.0
  * @uses $wp_query
  *
- * @param mixed $slug Optional. Tag slug or array of slugs.
+ * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
  * @return bool
  */
  * @return bool
  */
-function is_tag( $slug = '' ) {
+function is_tag( $tag = '' ) {
        global $wp_query;
 
        if ( ! isset( $wp_query ) ) {
        global $wp_query;
 
        if ( ! isset( $wp_query ) ) {
@@ -259,11 +257,11 @@ function is_tag( $slug = '' ) {
                return false;
        }
 
                return false;
        }
 
-       return $wp_query->is_tag( $slug );
+       return $wp_query->is_tag( $tag );
 }
 
 /**
 }
 
 /**
- * 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.
  *
  * If the $taxonomy parameter is specified, this function will additionally
  * check if the query is for that specific $taxonomy.
@@ -312,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
  *
  * @see WP_Query::is_date()
  * @since 1.5.0
@@ -332,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
  *
  * @see WP_Query::is_day()
  * @since 1.5.0
@@ -452,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
  *
  * @see WP_Query::is_month()
  * @since 1.5.0
@@ -472,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.
  *
  * If the $page parameter is specified, this function will additionally
  * check if the query is for one of the pages specified.
@@ -579,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
  *
  *
  * Works for any post type, except attachments and pages
  *
@@ -608,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.
  *
  * If the $post_types parameter is specified, this function will additionally
  * check if the query is for one of the Posts Types specified.
@@ -675,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
  *
  * @see WP_Query::is_year()
  * @since 1.5.0
@@ -722,6 +720,12 @@ function is_404() {
  * @return bool
  */
 function is_main_query() {
  * @return bool
  */
 function is_main_query() {
+       if ( 'pre_get_posts' === current_filter() ) {
+               $message = sprintf( __( 'In <code>%1$s</code>, use the <code>%2$s</code> method, not the <code>%3$s</code> function. See %4$s.' ),
+                       'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __( 'http://codex.wordpress.org/Function_Reference/is_main_query' ) );
+               _doing_it_wrong( __FUNCTION__, $message, '3.7' );
+       }
+
        global $wp_query;
        return $wp_query->is_main_query();
 }
        global $wp_query;
        return $wp_query->is_main_query();
 }
@@ -868,6 +872,15 @@ class WP_Query {
         */
        var $meta_query = false;
 
         */
        var $meta_query = false;
 
+       /**
+        * Date query container
+        *
+        * @since 3.7.0
+        * @access public
+        * @var object WP_Date_Query
+        */
+       var $date_query = false;
+
        /**
         * Holds the data for a single object that is queried.
         *
        /**
         * Holds the data for a single object that is queried.
         *
@@ -934,11 +947,11 @@ class WP_Query {
        var $in_the_loop = false;
 
        /**
        var $in_the_loop = false;
 
        /**
-        * The current post ID.
+        * The current post.
         *
         * @since 1.5.0
         * @access public
         *
         * @since 1.5.0
         * @access public
-        * @var object
+        * @var WP_Post
         */
        var $post;
 
         */
        var $post;
 
@@ -979,7 +992,9 @@ class WP_Query {
        var $comment;
 
        /**
        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
         *
         * @since 2.1.0
         * @access public
@@ -1277,6 +1292,14 @@ class WP_Query {
         */
         var $thumbnails_cached = false;
 
         */
         var $thumbnails_cached = false;
 
+       /**
+        * Cached list of search stopwords.
+        *
+        * @since 3.7.0
+        * @var array
+        */
+       private $stopwords;
+
        /**
         * Resets query flags to false.
         *
        /**
         * Resets query flags to false.
         *
@@ -1387,6 +1410,7 @@ class WP_Query {
                        , 'tag'
                        , 'cat'
                        , 'tag_id'
                        , 'tag'
                        , 'cat'
                        , 'tag_id'
+                       , 'author'
                        , 'author_name'
                        , 'feed'
                        , 'tb'
                        , 'author_name'
                        , 'feed'
                        , 'tb'
@@ -1398,6 +1422,7 @@ class WP_Query {
                        , 's'
                        , 'sentence'
                        , 'fields'
                        , 's'
                        , 'sentence'
                        , 'fields'
+                       , 'menu_order'
                );
 
                foreach ( $keys as $key ) {
                );
 
                foreach ( $keys as $key ) {
@@ -1405,8 +1430,9 @@ class WP_Query {
                                $array[$key] = '';
                }
 
                                $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',
+                       'author__in', 'author__not_in' );
 
                foreach ( $array_keys as $key ) {
                        if ( !isset($array[$key]) )
 
                foreach ( $array_keys as $key ) {
                        if ( !isset($array[$key]) )
@@ -1444,14 +1470,20 @@ class WP_Query {
                $qv['monthnum'] = absint($qv['monthnum']);
                $qv['day'] = absint($qv['day']);
                $qv['w'] = absint($qv['w']);
                $qv['monthnum'] = absint($qv['monthnum']);
                $qv['day'] = absint($qv['day']);
                $qv['w'] = absint($qv['w']);
-               $qv['m'] = absint($qv['m']);
+               $qv['m'] = preg_replace( '|[^0-9]|', '', $qv['m'] );
                $qv['paged'] = absint($qv['paged']);
                $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
                $qv['paged'] = absint($qv['paged']);
                $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
+               $qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
                $qv['pagename'] = trim( $qv['pagename'] );
                $qv['name'] = trim( $qv['name'] );
                if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
                if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
                if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
                $qv['pagename'] = trim( $qv['pagename'] );
                $qv['name'] = trim( $qv['name'] );
                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']);
+
+               // Fairly insane upper bound for search string lengths.
+               if ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 )
+                       $qv['s'] = '';
 
                // Compat. Map subpost to attachment.
                if ( '' != $qv['subpost'] )
 
                // Compat. Map subpost to attachment.
                if ( '' != $qv['subpost'] )
@@ -1499,15 +1531,24 @@ class WP_Query {
 
                        if ( $qv['day'] ) {
                                if ( ! $this->is_date ) {
 
                        if ( $qv['day'] ) {
                                if ( ! $this->is_date ) {
-                                       $this->is_day = true;
-                                       $this->is_date = true;
+                                       $date = sprintf( '%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day'] );
+                                       if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
+                                               $qv['error'] = '404';
+                                       } else {
+                                               $this->is_day = true;
+                                               $this->is_date = true;
+                                       }
                                }
                        }
 
                        if ( $qv['monthnum'] ) {
                                if ( ! $this->is_date ) {
                                }
                        }
 
                        if ( $qv['monthnum'] ) {
                                if ( ! $this->is_date ) {
-                                       $this->is_month = true;
-                                       $this->is_date = true;
+                                       if ( 12 < $qv['monthnum'] ) {
+                                               $qv['error'] = '404';
+                                       } else {
+                                               $this->is_month = true;
+                                               $this->is_date = true;
+                                       }
                                }
                        }
 
                                }
                        }
 
@@ -1674,7 +1715,7 @@ class WP_Query {
                do_action_ref_array('parse_query', array(&$this));
        }
 
                do_action_ref_array('parse_query', array(&$this));
        }
 
-       /*
+       /**
         * Parses various taxonomy related query vars.
         *
         * @access protected
         * Parses various taxonomy related query vars.
         *
         * @access protected
@@ -1697,7 +1738,7 @@ class WP_Query {
                        );
                }
 
                        );
                }
 
-               foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+               foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
                        if ( 'post_tag' == $taxonomy )
                                continue;       // Handled further down in the $q['tag'] block
 
                        if ( 'post_tag' == $taxonomy )
                                continue;       // Handled further down in the $q['tag'] block
 
@@ -1729,30 +1770,51 @@ class WP_Query {
                }
 
                // Category stuff
                }
 
                // Category stuff
-               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']);
-                       $q['cat'] = '';
-                       $req_cats = array();
-                       foreach ( (array) $cat_array as $cat ) {
-                               $cat = intval($cat);
-                               $req_cats[] = $cat;
-                               $in = ($cat > 0);
-                               $cat = abs($cat);
-                               if ( $in ) {
-                                       $q['category__in'][] = $cat;
-                                       $q['category__in'] = array_merge( $q['category__in'], get_term_children($cat, 'category') );
-                               } else {
-                                       $q['category__not_in'][] = $cat;
-                                       $q['category__not_in'] = array_merge( $q['category__not_in'], get_term_children($cat, 'category') );
-                               }
+               if ( ! empty( $q['cat'] ) && ! $this->is_singular ) {
+                       $cat_in = $cat_not_in = array();
+
+                       $cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
+                       $cat_array = array_map( 'intval', $cat_array );
+                       $q['cat'] = implode( ',', $cat_array );
+
+                       foreach ( $cat_array as $cat ) {
+                               if ( $cat > 0 )
+                                       $cat_in[] = $cat;
+                               elseif ( $cat < 0 )
+                                       $cat_not_in[] = abs( $cat );
                        }
                        }
-                       $q['cat'] = implode(',', $req_cats);
+
+                       if ( ! empty( $cat_in ) ) {
+                               $tax_query[] = array(
+                                       'taxonomy' => 'category',
+                                       'terms' => $cat_in,
+                                       'field' => 'term_id',
+                                       'include_children' => true
+                               );
+                       }
+
+                       if ( ! empty( $cat_not_in ) ) {
+                               $tax_query[] = array(
+                                       'taxonomy' => 'category',
+                                       'terms' => $cat_not_in,
+                                       'field' => 'term_id',
+                                       'operator' => 'NOT IN',
+                                       'include_children' => true
+                               );
+                       }
+                       unset( $cat_array, $cat_in, $cat_not_in );
+               }
+
+               if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+                       $q['category__and'] = (array) $q['category__and'];
+                       if ( ! isset( $q['category__in'] ) )
+                               $q['category__in'] = array();
+                       $q['category__in'][] = absint( reset( $q['category__and'] ) );
+                       unset( $q['category__and'] );
                }
 
                }
 
-               if ( !empty($q['category__in']) ) {
-                       $q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
+               if ( ! empty( $q['category__in'] ) ) {
+                       $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__in'],
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__in'],
@@ -1761,8 +1823,8 @@ class WP_Query {
                        );
                }
 
                        );
                }
 
-               if ( !empty($q['category__not_in']) ) {
-                       $q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
+               if ( ! empty($q['category__not_in']) ) {
+                       $q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__not_in'],
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__not_in'],
@@ -1771,8 +1833,8 @@ class WP_Query {
                        );
                }
 
                        );
                }
 
-               if ( !empty($q['category__and']) ) {
-                       $q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
+               if ( ! empty($q['category__and']) ) {
+                       $q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__and'],
                        $tax_query[] = array(
                                'taxonomy' => 'category',
                                'terms' => $q['category__and'],
@@ -1785,13 +1847,13 @@ class WP_Query {
                // Tag stuff
                if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
                        if ( strpos($q['tag'], ',') !== false ) {
                // Tag stuff
                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;
                                }
                                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;
                                foreach ( (array) $tags as $tag ) {
                                        $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                                        $q['tag_slug__and'][] = $tag;
@@ -1856,6 +1918,179 @@ class WP_Query {
                }
 
                $this->tax_query = new WP_Tax_Query( $tax_query );
                }
 
                $this->tax_query = new WP_Tax_Query( $tax_query );
+
+               do_action( 'parse_tax_query', $this );
+       }
+
+       /**
+        * Generate SQL for the WHERE clause based on passed search terms.
+        *
+        * @since 3.7.0
+        *
+        * @global wpdb $wpdb
+        * @param array $q Query variables.
+        * @return string WHERE clause.
+        */
+       protected function parse_search( &$q ) {
+               global $wpdb;
+
+               $search = '';
+
+               // 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'] );
+               // there are no line breaks in <input /> fields
+               $q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+               $q['search_terms_count'] = 1;
+               if ( ! empty( $q['sentence'] ) ) {
+                       $q['search_terms'] = array( $q['s'] );
+               } else {
+                       if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
+                               $q['search_terms_count'] = count( $matches[0] );
+                               $q['search_terms'] = $this->parse_search_terms( $matches[0] );
+                               // if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
+                               if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
+                                       $q['search_terms'] = array( $q['s'] );
+                       } else {
+                               $q['search_terms'] = array( $q['s'] );
+                       }
+               }
+
+               $n = ! empty( $q['exact'] ) ? '' : '%';
+               $searchand = '';
+               $q['search_orderby_title'] = array();
+               foreach ( $q['search_terms'] as $term ) {
+                       $term = like_escape( esc_sql( $term ) );
+                       if ( $n )
+                               $q['search_orderby_title'][] = "$wpdb->posts.post_title LIKE '%$term%'";
+
+                       $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
+                       $searchand = ' AND ';
+               }
+
+               if ( ! empty( $search ) ) {
+                       $search = " AND ({$search}) ";
+                       if ( ! is_user_logged_in() )
+                               $search .= " AND ($wpdb->posts.post_password = '') ";
+               }
+
+               return $search;
+       }
+
+       /**
+        * Check if the terms are suitable for searching.
+        *
+        * Uses an array of stopwords (terms) that are excluded from the separate
+        * term matching when searching for posts. The list of English stopwords is
+        * the approximate search engines list, and is translatable.
+        *
+        * @since 3.7.0
+        *
+        * @param array Terms to check.
+        * @return array Terms that are not stopwords.
+        */
+       protected function parse_search_terms( $terms ) {
+               $strtolower = function_exists( 'mb_strtolower' ) ? 'mb_strtolower' : 'strtolower';
+               $checked = array();
+
+               $stopwords = $this->get_search_stopwords();
+
+               foreach ( $terms as $term ) {
+                       // keep before/after spaces when term is for exact match
+                       if ( preg_match( '/^".+"$/', $term ) )
+                               $term = trim( $term, "\"'" );
+                       else
+                               $term = trim( $term, "\"' " );
+
+                       // Avoid single A-Z.
+                       if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z]$/i', $term ) ) )
+                               continue;
+
+                       if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
+                               continue;
+
+                       $checked[] = $term;
+               }
+
+               return $checked;
+       }
+
+       /**
+        * Retrieve stopwords used when parsing search terms.
+        *
+        * @since 3.7.0
+        *
+        * @return array Stopwords.
+        */
+       protected function get_search_stopwords() {
+               if ( isset( $this->stopwords ) )
+                       return $this->stopwords;
+
+               /* translators: This is a comma-separated list of very common words that should be excluded from a search,
+                * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
+                * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
+                */
+               $words = explode( ',', _x( 'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
+                       'Comma-separated list of search stopwords in your language' ) );
+
+               $stopwords = array();
+               foreach( $words as $word ) {
+                       $word = trim( $word, "\r\n\t " );
+                       if ( $word )
+                               $stopwords[] = $word;
+               }
+
+               /**
+                * Filter stopwords used when parsing search terms.
+                *
+                * @since 3.7.0
+                *
+                * @param array $stopwords Stopwords.
+                */
+               $this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+               return $this->stopwords;
+       }
+
+       /**
+        * Generate SQL for the ORDER BY condition based on passed search terms.
+        *
+        * @global wpdb $wpdb
+        * @param array $q Query variables.
+        * @return string ORDER BY clause.
+        */
+       protected function parse_search_order( &$q ) {
+               global $wpdb;
+
+               $search_orderby = '';
+
+               if ( $q['search_terms_count'] > 1 ) {
+                       $num_terms = count( $q['search_orderby_title'] );
+                       $search_orderby_s = like_escape( esc_sql( $q['s'] ) );
+
+                       $search_orderby = '(CASE ';
+                       // sentence match in 'post_title'
+                       $search_orderby .= "WHEN $wpdb->posts.post_title LIKE '%{$search_orderby_s}%' THEN 1 ";
+
+                       // sanity limit, sort as sentence when more than 6 terms
+                       // (few searches are longer than 6 terms and most titles are not)
+                       if ( $num_terms < 7 ) {
+                               // all words in title
+                               $search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
+                               // any word in title, not needed when $num_terms == 1
+                               if ( $num_terms > 1 )
+                                       $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+                       }
+
+                       // sentence match in 'post_content'
+                       $search_orderby .= "WHEN $wpdb->posts.post_content LIKE '%{$search_orderby_s}%' THEN 4 ";
+                       $search_orderby .= 'ELSE 5 END)';
+               } else {
+                       // single word or sentence search
+                       $search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
+               }
+
+               return $search_orderby;
        }
 
        /**
        }
 
        /**
@@ -1914,8 +2149,8 @@ class WP_Query {
         *
         * @return array List of posts.
         */
         *
         * @return array List of posts.
         */
-       function &get_posts() {
-               global $wpdb, $user_ID, $_wp_using_ext_object_cache;
+       function get_posts() {
+               global $wpdb;
 
                $this->parse_query();
 
 
                $this->parse_query();
 
@@ -1965,7 +2200,7 @@ class WP_Query {
                        $q['suppress_filters'] = false;
 
                if ( !isset($q['cache_results']) ) {
                        $q['suppress_filters'] = false;
 
                if ( !isset($q['cache_results']) ) {
-                       if ( $_wp_using_ext_object_cache )
+                       if ( wp_using_ext_object_cache() )
                                $q['cache_results'] = false;
                        else
                                $q['cache_results'] = true;
                                $q['cache_results'] = false;
                        else
                                $q['cache_results'] = true;
@@ -2040,9 +2275,11 @@ class WP_Query {
                                $fields = "$wpdb->posts.*";
                }
 
                                $fields = "$wpdb->posts.*";
                }
 
-               // If a month is specified in the querystring, load that month
+               if ( '' !== $q['menu_order'] )
+                       $where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+
+               // The "m" parameter is meant for months but accepts datetimes of varying specificity
                if ( $q['m'] ) {
                if ( $q['m'] ) {
-                       $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
                        $where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
                        if ( strlen($q['m']) > 5 )
                                $where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
                        $where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
                        if ( strlen($q['m']) > 5 )
                                $where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
@@ -2056,25 +2293,44 @@ class WP_Query {
                                $where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
                }
 
                                $where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
                }
 
+               // Handle the other individual date parameters
+               $date_parameters = array();
+
                if ( '' !== $q['hour'] )
                if ( '' !== $q['hour'] )
-                       $where .= " AND HOUR($wpdb->posts.post_date)='" . $q['hour'] . "'";
+                       $date_parameters['hour'] = $q['hour'];
 
                if ( '' !== $q['minute'] )
 
                if ( '' !== $q['minute'] )
-                       $where .= " AND MINUTE($wpdb->posts.post_date)='" . $q['minute'] . "'";
+                       $date_parameters['minute'] = $q['minute'];
 
                if ( '' !== $q['second'] )
 
                if ( '' !== $q['second'] )
-                       $where .= " AND SECOND($wpdb->posts.post_date)='" . $q['second'] . "'";
+                       $date_parameters['second'] = $q['second'];
 
                if ( $q['year'] )
 
                if ( $q['year'] )
-                       $where .= " AND YEAR($wpdb->posts.post_date)='" . $q['year'] . "'";
+                       $date_parameters['year'] = $q['year'];
 
                if ( $q['monthnum'] )
 
                if ( $q['monthnum'] )
-                       $where .= " AND MONTH($wpdb->posts.post_date)='" . $q['monthnum'] . "'";
+                       $date_parameters['monthnum'] = $q['monthnum'];
+
+               if ( $q['w'] )
+                       $date_parameters['week'] = $q['w'];
 
                if ( $q['day'] )
 
                if ( $q['day'] )
-                       $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
+                       $date_parameters['day'] = $q['day'];
+
+               if ( $date_parameters ) {
+                       $date_query = new WP_Date_Query( array( $date_parameters ) );
+                       $where .= $date_query->get_sql();
+               }
+               unset( $date_parameters, $date_query );
+
+               // Handle complex date queries
+               if ( ! empty( $q['date_query'] ) ) {
+                       $this->date_query = new WP_Date_Query( $q['date_query'] );
+                       $where .= $this->date_query->get_sql();
+               }
 
 
-               // 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);
                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);
@@ -2128,7 +2384,7 @@ class WP_Query {
                                $q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
                                $q['name'] = $q['pagename'];
                                $where .= " AND ($wpdb->posts.ID = '$reqpage')";
                                $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';
                                if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
                                        $this->is_attachment = true;
                                        $post_type = $q['post_type'] = 'attachment';
@@ -2142,8 +2398,6 @@ class WP_Query {
                        $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
                }
 
                        $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
                }
 
-               if ( $q['w'] )
-                       $where .= ' AND ' . _wp_mysql_week( "`$wpdb->posts`.`post_date`" ) . " = '" . $q['w'] . "'";
 
                if ( intval($q['comments_popup']) )
                        $q['p'] = absint($q['comments_popup']);
 
                if ( intval($q['comments_popup']) )
                        $q['p'] = absint($q['comments_popup']);
@@ -2163,8 +2417,15 @@ class WP_Query {
                        $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
                }
 
                        $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'] );
                        $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') ) ) {
 
                if ( $q['page_id'] ) {
                        if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
@@ -2173,33 +2434,19 @@ class WP_Query {
                        }
                }
 
                        }
                }
 
-               // If a search pattern is specified, load the posts that match
-               if ( !empty($q['s']) ) {
-                       // added slashes screw with quote grouping when done early, so done later
-                       $q['s'] = stripslashes($q['s']);
-                       if ( !empty($q['sentence']) ) {
-                               $q['search_terms'] = array($q['s']);
-                       } else {
-                               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']) ? '' : '%';
-                       $searchand = '';
-                       foreach( (array) $q['search_terms'] as $term ) {
-                               $term = esc_sql( like_escape( $term ) );
-                               $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
-                               $searchand = ' AND ';
-                       }
-
-                       if ( !empty($search) ) {
-                               $search = " AND ({$search}) ";
-                               if ( !is_user_logged_in() )
-                                       $search .= " AND ($wpdb->posts.post_password = '') ";
-                       }
-               }
+               // If a search pattern is specified, load the posts that match.
+               if ( ! empty( $q['s'] ) )
+                       $search = $this->parse_search( $q );
 
 
-               // Allow plugins to contextually add/remove/modify the search section of the database query
-               $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
+               /**
+                * Filter the search SQL that is used in the WHERE clause of WP_Query.
+                *
+                * @since 3.0.0
+                *
+                * @param string   $search Search SQL for WHERE clause.
+                * @param WP_Query $this   The current WP_Query object.
+                */
+               $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );
 
                // Taxonomies
                if ( !$this->is_singular ) {
 
                // Taxonomies
                if ( !$this->is_singular ) {
@@ -2213,7 +2460,19 @@ class WP_Query {
 
                if ( $this->is_tax ) {
                        if ( empty($post_type) ) {
 
                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;
                                $post_status_join = true;
                        } elseif ( in_array('attachment', (array) $post_type) ) {
                                $post_status_join = true;
@@ -2239,25 +2498,30 @@ class WP_Query {
                                }
 
                                $cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) );
                                }
 
                                $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 );
                                        $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' ) );
                                }
                                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 );
                                        $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 );
                        }
                                }
                                unset( $tag_query );
                        }
@@ -2269,26 +2533,22 @@ class WP_Query {
 
                // Author/user stuff
 
 
                // Author/user stuff
 
-               if ( empty($q['author']) || ($q['author'] == '0') ) {
-                       $whichauthor = '';
-               } else {
-                       $q['author'] = (string)urldecode($q['author']);
-                       $q['author'] = addslashes_gpc($q['author']);
-                       if ( strpos($q['author'], '-') !== false ) {
-                               $eq = '!=';
-                               $andor = 'AND';
-                               $q['author'] = explode('-', $q['author']);
-                               $q['author'] = (string)absint($q['author'][1]);
-                       } else {
-                               $eq = '=';
-                               $andor = 'OR';
+               if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
+                       $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
+                       $authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
+                       foreach ( $authors as $author ) {
+                               $key = $author > 0 ? 'author__in' : 'author__not_in';
+                               $q[$key][] = abs( $author );
                        }
                        }
-                       $author_array = preg_split('/[,\s]+/', $q['author']);
-                       $_author_array = array();
-                       foreach ( $author_array as $key => $_author )
-                               $_author_array[] = "$wpdb->posts.post_author " . $eq . ' ' . absint($_author);
-                       $whichauthor .= ' AND (' . implode(" $andor ", $_author_array) . ')';
-                       unset($author_array, $_author_array);
+                       $q['author'] = implode( ',', $authors );
+               }
+
+               if ( ! empty( $q['author__not_in'] ) ) {
+                       $author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
+                       $where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
+               } elseif ( ! empty( $q['author__in'] ) ) {
+                       $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
+                       $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
                }
 
                // Author stuff for nice URLs
                }
 
                // Author stuff for nice URLs
@@ -2324,6 +2584,10 @@ class WP_Query {
                        $orderby = "$wpdb->posts.post_date " . $q['order'];
                } elseif ( 'none' == $q['orderby'] ) {
                        $orderby = '';
                        $orderby = "$wpdb->posts.post_date " . $q['order'];
                } elseif ( 'none' == $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('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
                } else {
                        // Used to filter values
                        $allowed_keys = array('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
@@ -2353,7 +2617,12 @@ class WP_Query {
                                                break;
                                        case $q['meta_key']:
                                        case 'meta_value':
                                                break;
                                        case $q['meta_key']:
                                        case 'meta_value':
-                                               $orderby = "$wpdb->postmeta.meta_value";
+                                               if ( isset( $q['meta_type'] ) ) {
+                                                       $meta_type = $this->meta_query->get_cast_for_type( $q['meta_type'] );
+                                                       $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
+                                               } else {
+                                                       $orderby = "$wpdb->postmeta.meta_value";
+                                               }
                                                break;
                                        case 'meta_value_num':
                                                $orderby = "$wpdb->postmeta.meta_value+0";
                                                break;
                                        case 'meta_value_num':
                                                $orderby = "$wpdb->postmeta.meta_value+0";
@@ -2375,9 +2644,30 @@ class WP_Query {
                                $orderby .= " {$q['order']}";
                }
 
                                $orderby .= " {$q['order']}";
                }
 
-               if ( is_array( $post_type ) ) {
+               // Order search results by relevance only when another "orderby" is not specified in the query.
+               if ( ! empty( $q['s'] ) ) {
+                       $search_orderby = '';
+                       if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
+                               $search_orderby = $this->parse_search_order( $q );
+
+                       /**
+                        * Filter the ORDER BY used when ordering search results.
+                        *
+                        * @since 3.7.0
+                        *
+                        * @param string   $search_orderby The ORDER BY clause.
+                        * @param WP_Query $this           The current WP_Query instance.
+                        */
+                       $search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+                       if ( $search_orderby )
+                               $orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+               }
+
+               if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
                        $post_type_cap = 'multiple_post_type';
                } else {
                        $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;
                        $post_type_object = get_post_type_object( $post_type );
                        if ( empty( $post_type_object ) )
                                $post_type_cap = $post_type;
@@ -2385,8 +2675,10 @@ class WP_Query {
 
                if ( 'any' == $post_type ) {
                        $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
 
                if ( 'any' == $post_type ) {
                        $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-                       if ( ! empty( $in_search_post_types ) )
-                               $where .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
+                       if ( empty( $in_search_post_types ) )
+                               $where .= ' AND 1=0 ';
+                       else
+                               $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 ) ) {
                } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
                        $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
                } elseif ( ! empty( $post_type ) ) {
@@ -2403,18 +2695,19 @@ class WP_Query {
                        $post_type_object = get_post_type_object ( 'post' );
                }
 
                        $post_type_object = get_post_type_object ( 'post' );
                }
 
+               $edit_cap = 'edit_post';
+               $read_cap = 'read_post';
+
                if ( ! empty( $post_type_object ) ) {
                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_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';
                }
 
                        $edit_others_cap = 'edit_others_' . $post_type_cap . 's';
                        $read_private_cap = 'read_private_' . $post_type_cap . 's';
                }
 
+               $user_id = get_current_user_id();
+
                if ( ! empty( $q['post_status'] ) ) {
                        $statuswheres = array();
                        $q_status = $q['post_status'];
                if ( ! empty( $q['post_status'] ) ) {
                        $statuswheres = array();
                        $q_status = $q['post_status'];
@@ -2447,13 +2740,13 @@ class WP_Query {
                        }
                        if ( !empty($r_status) ) {
                                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
                        }
                        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) )
                                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 ) . ")";
                        }
                                else
                                        $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
                        }
@@ -2486,7 +2779,7 @@ class WP_Query {
                                // Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
                                $private_states = get_post_stati( array('private' => true) );
                                foreach ( (array) $private_states as $state )
                                // Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
                                $private_states = get_post_stati( array('private' => true) );
                                foreach ( (array) $private_states as $state )
-                                       $where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.post_status = '$state'";
+                                       $where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
                        }
 
                        $where .= ')';
                        }
 
                        $where .= ')';
@@ -2612,13 +2905,17 @@ class WP_Query {
                }
 
                if ( 'ids' == $q['fields'] ) {
                }
 
                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'] ) {
 
                        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 )
 
                        $r = array();
                        foreach ( $this->posts as $post )
@@ -2640,13 +2937,10 @@ class WP_Query {
                        $ids = $wpdb->get_col( $this->request );
 
                        if ( $ids ) {
                        $ids = $wpdb->get_col( $this->request );
 
                        if ( $ids ) {
+                               $this->posts = $ids;
                                $this->set_found_posts( $q, $limits );
                                $this->set_found_posts( $q, $limits );
-
                                _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
                                _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
-
-                               $this->posts = array_map( 'get_post', $ids );
                        } else {
                        } else {
-                               $this->found_posts = $this->max_num_pages = 0;
                                $this->posts = array();
                        }
                } else {
                                $this->posts = array();
                        }
                } else {
@@ -2654,6 +2948,10 @@ class WP_Query {
                        $this->set_found_posts( $q, $limits );
                }
 
                        $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.
                if ( !$q['suppress_filters'] )
                        $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
                // Raw results filter. Prior to status checks.
                if ( !$q['suppress_filters'] )
                        $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
@@ -2700,7 +2998,7 @@ class WP_Query {
                        }
 
                        if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) )
                        }
 
                        if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) )
-                               $this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], &$this ));
+                               $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
                }
 
                // Put sticky posts at the top of the posts array
@@ -2730,24 +3028,15 @@ class WP_Query {
 
                        // Fetch sticky posts that weren't in the query results
                        if ( !empty($sticky_posts) ) {
 
                        // 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 ) {
                                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++;
                                }
                        }
                                        $sticky_offset++;
                                }
                        }
@@ -2756,33 +3045,49 @@ class WP_Query {
                if ( !$q['suppress_filters'] )
                        $this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) );
 
                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 );
 
 
-               // Always sanitize
-               foreach ( $this->posts as $i => $post ) {
-                       $this->posts[$i] = sanitize_post( $post, '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;
        }
 
                }
 
                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;
 
        function set_found_posts( $q, $limits ) {
                global $wpdb;
 
-               if ( $q['no_found_rows'] || empty( $limits ) )
+               // 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;
 
                        return;
 
-               $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
+               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 ) );
 
                $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'] );
+               if ( ! empty( $limits ) )
+                       $this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
        }
 
        /**
        }
 
        /**
@@ -2791,7 +3096,7 @@ class WP_Query {
         * @since 1.5.0
         * @access public
         *
         * @since 1.5.0
         * @access public
         *
-        * @return object Next post.
+        * @return WP_Post Next post.
         */
        function next_post() {
 
         */
        function next_post() {
 
@@ -2935,7 +3240,7 @@ class WP_Query {
         * @param string $query URL query string.
         * @return array List of posts.
         */
         * @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();
                $this->init();
                $this->query = $this->query_vars = wp_parse_args( $query );
                return $this->get_posts();
@@ -2961,27 +3266,46 @@ class WP_Query {
                $this->queried_object_id = 0;
 
                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
                $this->queried_object_id = 0;
 
                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-                       $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
-
-                       $query = reset( $tax_query_in_and );
+                       if ( $this->is_category ) {
+                               if ( $this->get( 'cat' ) ) {
+                                       $term = get_term( $this->get( 'cat' ), 'category' );
+                               } elseif ( $this->get( 'category_name' ) ) {
+                                       $term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+                               }
+                       } elseif ( $this->is_tag ) {
+                               if ( $this->get( 'tag_id' ) ) {
+                                       $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
+                               } elseif ( $this->get( 'tag' ) ) {
+                                       $term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+                               }
+                       } else {
+                               $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
+                               $query = reset( $tax_query_in_and );
 
 
-                       if ( 'term_id' == $query['field'] )
-                               $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-                       else
-                               $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+                               if ( $query['terms'] ) {
+                                       if ( 'term_id' == $query['field'] ) {
+                                               $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
+                                       } else {
+                                               $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;
 
                                $this->queried_object = $term;
                                $this->queried_object_id = (int) $term->term_id;
 
-                               if ( $this->is_category )
+                               if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
                                        _make_cat_compat( $this->queried_object );
                        }
                } elseif ( $this->is_post_type_archive ) {
                                        _make_cat_compat( $this->queried_object );
                        }
                } elseif ( $this->is_post_type_archive ) {
-                       $this->queried_object = get_post_type_object( $this->get('post_type') );
+                       $post_type = $this->get( 'post_type' );
+                       if ( is_array( $post_type ) )
+                               $post_type = reset( $post_type );
+                       $this->queried_object = get_post_type_object( $post_type );
                } elseif ( $this->is_posts_page ) {
                        $page_for_posts = get_option('page_for_posts');
                } 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;
                        $this->queried_object_id = (int) $this->queried_object->ID;
                } elseif ( $this->is_singular && !is_null($this->post) ) {
                        $this->queried_object = $this->post;
@@ -3030,7 +3354,7 @@ class WP_Query {
        }
 
        /**
        }
 
        /**
-        * Is the query for an archive page?
+        * Is the query for an existing archive page?
         *
         * Month, Year, Category, Author, Post Type archive...
         *
         *
         * Month, Year, Category, Author, Post Type archive...
         *
@@ -3043,7 +3367,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
         *
         *
         * @since 3.1.0
         *
@@ -3051,16 +3375,19 @@ class WP_Query {
         * @return bool
         */
        function is_post_type_archive( $post_types = '' ) {
         * @return bool
         */
        function is_post_type_archive( $post_types = '' ) {
-               if ( empty( $post_types ) || !$this->is_post_type_archive )
+               if ( empty( $post_types ) || ! $this->is_post_type_archive )
                        return (bool) $this->is_post_type_archive;
 
                        return (bool) $this->is_post_type_archive;
 
-               $post_type_object = $this->get_queried_object();
+               $post_type = $this->get( 'post_type' );
+               if ( is_array( $post_type ) )
+                       $post_type = reset( $post_type );
+               $post_type_object = get_post_type_object( $post_type );
 
                return in_array( $post_type_object->name, (array) $post_types );
        }
 
        /**
 
                return in_array( $post_type_object->name, (array) $post_types );
        }
 
        /**
-        * Is the query for an attachment page?
+        * Is the query for an existing attachment page?
         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *
@@ -3071,7 +3398,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.
         *
         * If the $author parameter is specified, this function will additionally
         * check if the query is for one of the authors specified.
@@ -3103,7 +3430,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.
         *
         * If the $category parameter is specified, this function will additionally
         * check if the query is for one of the categories specified.
@@ -3135,35 +3462,39 @@ 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.
         *
         * @since 3.1.0
         *
         *
         * If the $tag parameter is specified, this function will additionally
         * check if the query is for one of the tags specified.
         *
         * @since 3.1.0
         *
-        * @param mixed $slug Optional. Tag slug or array of slugs.
+        * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
         * @return bool
         */
         * @return bool
         */
-       function is_tag( $slug = '' ) {
-               if ( !$this->is_tag )
+       function is_tag( $tag = '' ) {
+               if ( ! $this->is_tag )
                        return false;
 
                        return false;
 
-               if ( empty( $slug ) )
+               if ( empty( $tag ) )
                        return true;
 
                $tag_obj = $this->get_queried_object();
 
                        return true;
 
                $tag_obj = $this->get_queried_object();
 
-               $slug = (array) $slug;
+               $tag = (array) $tag;
 
 
-               if ( in_array( $tag_obj->slug, $slug ) )
+               if ( in_array( $tag_obj->term_id, $tag ) )
+                       return true;
+               elseif ( in_array( $tag_obj->name, $tag ) )
+                       return true;
+               elseif ( in_array( $tag_obj->slug, $tag ) )
                        return true;
 
                return false;
        }
 
        /**
                        return true;
 
                return false;
        }
 
        /**
-        * 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.
         *
         * If the $taxonomy parameter is specified, this function will additionally
         * check if the query is for that specific $taxonomy.
@@ -3191,8 +3522,13 @@ class WP_Query {
                $tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
                $term_array = (array) $term;
 
                $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(
 
                return isset( $queried_object->term_id ) &&
                        count( array_intersect(
@@ -3213,7 +3549,7 @@ class WP_Query {
        }
 
        /**
        }
 
        /**
-        * Is the query for a date archive?
+        * Is the query for an existing date archive?
         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *
@@ -3224,7 +3560,7 @@ class WP_Query {
        }
 
        /**
        }
 
        /**
-        * Is the query for a day archive?
+        * Is the query for an existing day archive?
         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *
@@ -3311,7 +3647,7 @@ class WP_Query {
        }
 
        /**
        }
 
        /**
-        * Is the query for a month archive?
+        * Is the query for an existing month archive?
         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *
@@ -3322,7 +3658,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.
         *
         * If the $page parameter is specified, this function will additionally
         * check if the query is for one of the pages specified.
@@ -3401,7 +3737,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
         *
         *
         * Works for any post type, except attachments and pages
         *
@@ -3438,7 +3774,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.
         *
         * If the $post_types parameter is specified, this function will additionally
         * check if the query is for one of the Posts Types specified.
@@ -3483,7 +3819,7 @@ class WP_Query {
        }
 
        /**
        }
 
        /**
-        * Is the query for a specific year?
+        * Is the query for an existing year archive?
         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *
@@ -3515,6 +3851,21 @@ class WP_Query {
                global $wp_the_query;
                return $wp_the_query === $this;
        }
                global $wp_the_query;
                return $wp_the_query === $this;
        }
+
+       /**
+        * After looping through a nested query, this function
+        * restores the $post global to the current post in this query.
+        *
+        * @since 3.7.0
+        *
+        * @return bool
+        */
+       function reset_postdata() {
+               if ( ! empty( $this->post ) ) {
+                       $GLOBALS['post'] = $this->post;
+                       setup_postdata( $this->post );
+               }
+       }
 }
 
 /**
 }
 
 /**
@@ -3586,7 +3937,7 @@ function wp_old_slug_redirect() {
  * @uses do_action_ref_array() Calls 'the_post'
  * @return bool True when finished.
  */
  * @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;
        global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
        $id = (int) $post->ID;
@@ -3596,24 +3947,28 @@ function setup_postdata($post) {
        $currentday = mysql2date('d.m.y', $post->post_date, false);
        $currentmonth = mysql2date('m', $post->post_date, false);
        $numpages = 1;
        $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');
        $page = get_query_var('page');
-       if ( !$page )
+       if ( ! $page )
                $page = 1;
        if ( is_single() || is_page() || is_feed() )
                $more = 1;
        $content = $post->post_content;
                $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;
                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);
                $pages = explode('<!--nextpage-->', $content);
                $numpages = count($pages);
+               if ( $numpages > 1 )
+                       $multipage = 1;
        } else {
                $pages = array( $post->post_content );
        } else {
                $pages = array( $post->post_content );
-               $multipage = 0;
        }
 
        do_action_ref_array('the_post', array(&$post));
        }
 
        do_action_ref_array('the_post', array(&$post));