X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-includes/query.php

diff --git a/wp-includes/query.php b/wp-includes/query.php
index cfb1e772..7cbac9db 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -5,7 +5,7 @@
  * 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 https://codex.wordpress.org/The_Loop More information on The Loop.
  *
  * @package WordPress
  * @subpackage Query
@@ -14,9 +14,9 @@
 /**
  * Retrieve variable in the WP_Query class.
  *
- * @see WP_Query::get()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param string $var       The variable key to retrieve.
  * @param mixed  $default   Value to return if the query variable is not set. Default ''.
@@ -24,18 +24,17 @@
  */
 function get_query_var( $var, $default = '' ) {
 	global $wp_query;
-
 	return $wp_query->get( $var, $default );
 }
 
 /**
  * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
  *
- * @uses WP_Query::get_queried_object
- *
  * @since 3.1.0
  * @access public
  *
+ * @global WP_Query $wp_query
+ *
  * @return object
  */
 function get_queried_object() {
@@ -46,11 +45,11 @@ function get_queried_object() {
 /**
  * Retrieve ID of the current queried object. Wrapper for $wp_query->get_queried_object_id()
  *
- * @uses WP_Query::get_queried_object_id()
- *
  * @since 3.1.0
  * @access public
  *
+ * @global WP_Query $wp_query
+ *
  * @return int
  */
 function get_queried_object_id() {
@@ -61,18 +60,16 @@ function get_queried_object_id() {
 /**
  * Set query variable.
  *
- * @see WP_Query::set()
  * @since 2.2.0
- * @uses $wp_query
  *
- * @param string $var Query variable key.
- * @param mixed $value
- * @return null
+ * @global WP_Query $wp_query
+ *
+ * @param string $var   Query variable key.
+ * @param mixed  $value
  */
-function set_query_var($var, $value) {
+function set_query_var( $var, $value ) {
 	global $wp_query;
-
-	return $wp_query->set($var, $value);
+	$wp_query->set( $var, $value );
 }
 
 /**
@@ -82,7 +79,8 @@ function set_query_var($var, $value) {
  * once. This must not be used within the WordPress Loop.
  *
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param string $query
  * @return array List of posts
@@ -100,7 +98,9 @@ function query_posts($query) {
  * wp_query object is not destroyed properly before another is set up.
  *
  * @since 2.3.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
+ * @global WP_Query $wp_the_query
  */
 function wp_reset_query() {
 	$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
@@ -112,7 +112,8 @@ function wp_reset_query() {
  * the $post global to the current post in the main query.
  *
  * @since 3.0.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  */
 function wp_reset_postdata() {
 	global $wp_query;
@@ -131,9 +132,9 @@ function wp_reset_postdata() {
  *
  * Month, Year, Category, Author, Post Type archive...
  *
- * @see WP_Query::is_archive()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -151,11 +152,11 @@ function is_archive() {
 /**
  * Is the query for an existing post type archive page?
  *
- * @see WP_Query::is_post_type_archive()
  * @since 3.1.0
- * @uses $wp_query
  *
- * @param mixed $post_types Optional. Post type or array of posts types to check against.
+ * @global WP_Query $wp_query
+ *
+ * @param string|array $post_types Optional. Post type or array of posts types to check against.
  * @return bool
  */
 function is_post_type_archive( $post_types = '' ) {
@@ -172,9 +173,9 @@ function is_post_type_archive( $post_types = '' ) {
 /**
  * Is the query for an existing attachment page?
  *
- * @see WP_Query::is_attachment()
  * @since 2.0.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param int|string|array|object $attachment Attachment ID, title, slug, or array of such.
  * @return bool
@@ -196,9 +197,9 @@ function is_attachment( $attachment = '' ) {
  * If the $author parameter is specified, this function will additionally
  * check if the query is for one of the authors specified.
  *
- * @see WP_Query::is_author()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
  * @return bool
@@ -220,9 +221,9 @@ function is_author( $author = '' ) {
  * If the $category parameter is specified, this function will additionally
  * check if the query is for one of the categories specified.
  *
- * @see WP_Query::is_category()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
  * @return bool
@@ -244,9 +245,9 @@ function is_category( $category = '' ) {
  * If the $tag parameter is specified, this function will additionally
  * check if the query is for one of the tags specified.
  *
- * @see WP_Query::is_tag()
  * @since 2.3.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
  * @return bool
@@ -272,12 +273,12 @@ function is_tag( $tag = '' ) {
  * this function will additionally check if the query is for one of the terms
  * specified.
  *
- * @see WP_Query::is_tax()
  * @since 2.5.0
- * @uses $wp_query
  *
- * @param string|array $taxonomy Optional. Taxonomy slug or slugs.
- * @param int|string|array $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
+ * @global WP_Query $wp_query
+ *
+ * @param string|array     $taxonomy Optional. Taxonomy slug or slugs.
+ * @param int|string|array $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
  * @return bool
  */
 function is_tax( $taxonomy = '', $term = '' ) {
@@ -294,9 +295,9 @@ function is_tax( $taxonomy = '', $term = '' ) {
 /**
  * Whether the current URL is within the comments popup window.
  *
- * @see WP_Query::is_comments_popup()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -314,9 +315,9 @@ function is_comments_popup() {
 /**
  * Is the query for an existing date archive?
  *
- * @see WP_Query::is_date()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -334,9 +335,9 @@ function is_date() {
 /**
  * Is the query for an existing day archive?
  *
- * @see WP_Query::is_day()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -354,9 +355,9 @@ function is_day() {
 /**
  * Is the query for a feed?
  *
- * @see WP_Query::is_feed()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param string|array $feeds Optional feed types to check.
  * @return bool
@@ -375,9 +376,9 @@ function is_feed( $feeds = '' ) {
 /**
  * Is the query for a comments feed?
  *
- * @see WP_Query::is_comments_feed()
  * @since 3.0.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -404,9 +405,10 @@ function is_comment_feed() {
  *
  * Otherwise the same as @see is_home()
  *
- * @see WP_Query::is_front_page()
  * @since 2.5.0
  *
+ * @global WP_Query $wp_query
+ *
  * @return bool True, if front of site.
  */
 function is_front_page() {
@@ -432,9 +434,9 @@ function is_front_page() {
  *
  * @see is_front_page()
  *
- * @see WP_Query::is_home()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool True if blog view homepage.
  */
@@ -452,9 +454,9 @@ function is_home() {
 /**
  * Is the query for an existing month archive?
  *
- * @see WP_Query::is_month()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -478,9 +480,9 @@ function is_month() {
  * @see is_single()
  * @see is_singular()
  *
- * @see WP_Query::is_page()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $page Page ID, title, slug, or array of such.
  * @return bool
@@ -499,9 +501,9 @@ function is_page( $page = '' ) {
 /**
  * Is the query for paged result and not for the first page?
  *
- * @see WP_Query::is_paged()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -519,9 +521,9 @@ function is_paged() {
 /**
  * Is the query for a post or page preview?
  *
- * @see WP_Query::is_preview()
  * @since 2.0.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -539,9 +541,9 @@ function is_preview() {
 /**
  * Is the query for the robots file?
  *
- * @see WP_Query::is_robots()
  * @since 2.1.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -559,9 +561,9 @@ function is_robots() {
 /**
  * Is the query for a search?
  *
- * @see WP_Query::is_search()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -587,9 +589,9 @@ function is_search() {
  * @see is_page()
  * @see is_singular()
  *
- * @see WP_Query::is_single()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $post Post ID, title, slug, or array of such.
  * @return bool
@@ -614,9 +616,9 @@ function is_single( $post = '' ) {
  * @see is_page()
  * @see is_single()
  *
- * @see WP_Query::is_singular()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @param mixed $post_types Optional. Post Type or array of Post Types
  * @return bool
@@ -635,9 +637,9 @@ function is_singular( $post_types = '' ) {
 /**
  * Is the query for a specific time?
  *
- * @see WP_Query::is_time()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -655,9 +657,9 @@ function is_time() {
 /**
  * Is the query for a trackback endpoint call?
  *
- * @see WP_Query::is_trackback()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -675,9 +677,9 @@ function is_trackback() {
 /**
  * Is the query for an existing year archive?
  *
- * @see WP_Query::is_year()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -695,9 +697,9 @@ function is_year() {
 /**
  * Is the query a 404 (returns no results)?
  *
- * @see WP_Query::is_404()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -717,12 +719,14 @@ function is_404() {
  *
  * @since 3.3.0
  *
+ * @global WP_Query $wp_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' ) );
+			'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __( 'https://codex.wordpress.org/Function_Reference/is_main_query' ) );
 		_doing_it_wrong( __FUNCTION__, $message, '3.7' );
 	}
 
@@ -737,15 +741,14 @@ function is_main_query() {
 /**
  * Whether current WordPress query has results to loop over.
  *
- * @see WP_Query::have_posts()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
 function have_posts() {
 	global $wp_query;
-
 	return $wp_query->have_posts();
 }
 
@@ -753,41 +756,37 @@ function have_posts() {
  * Whether the caller is in the Loop.
  *
  * @since 2.0.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool True if caller is within loop, false if loop hasn't started or ended.
  */
 function in_the_loop() {
 	global $wp_query;
-
 	return $wp_query->in_the_loop;
 }
 
 /**
  * Rewind the loop posts.
  *
- * @see WP_Query::rewind_posts()
  * @since 1.5.0
- * @uses $wp_query
  *
- * @return null
+ * @global WP_Query $wp_query
  */
 function rewind_posts() {
 	global $wp_query;
-
-	return $wp_query->rewind_posts();
+	$wp_query->rewind_posts();
 }
 
 /**
  * Iterate the post index in the loop.
  *
- * @see WP_Query::the_post()
  * @since 1.5.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  */
 function the_post() {
 	global $wp_query;
-
 	$wp_query->the_post();
 }
 
@@ -798,9 +797,9 @@ function the_post() {
 /**
  * Whether there are comments to loop over.
  *
- * @see WP_Query::have_comments()
  * @since 2.2.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return bool
  */
@@ -812,9 +811,9 @@ function have_comments() {
 /**
  * Iterate comment index in the comment loop.
  *
- * @see WP_Query::the_comment()
  * @since 2.2.0
- * @uses $wp_query
+ *
+ * @global WP_Query $wp_query
  *
  * @return object
  */
@@ -830,7 +829,7 @@ function the_comment() {
 /**
  * The WordPress Query class.
  *
- * @link http://codex.wordpress.org/Function_Reference/WP_Query Codex page.
+ * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
  *
  * @since 1.5.0
  */
@@ -1271,6 +1270,7 @@ class WP_Query {
 	 *
 	 * @since 3.1.0
 	 * @access private
+	 * @var bool|string
 	 */
 	private $query_vars_hash = false;
 
@@ -1300,6 +1300,10 @@ class WP_Query {
 	 */
 	private $stopwords;
 
+	private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' );
+
+	private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
+
 	/**
 	 * Resets query flags to false.
 	 *
@@ -1445,6 +1449,8 @@ class WP_Query {
 	 * Parse a query string and set query type booleans.
 	 *
 	 * @since 1.5.0
+	 * @since 4.2.0 Introduced the ability to order by specific clauses of a `$meta_query`, by passing the clause's
+	 *              array key to `$orderby`.
 	 * @access public
 	 *
 	 * @param string|array $query {
@@ -1472,7 +1478,7 @@ class WP_Query {
 	 *                                                 or array of fields. 'id=>parent' uses 'id' and 'post_parent'.
 	 *                                                 Default all fields. Accepts 'ids', 'id=>parent'.
 	 *     @type int          $hour                    Hour of the day. Default empty. Accepts numbers 0-23.
-	 *     @type bool         $ignore_sticky_posts     Whether to ignore sticky posts or not. Setting this to false
+	 *     @type int|bool     $ignore_sticky_posts     Whether to ignore sticky posts or not. Setting this to false
 	 *                                                 excludes stickies from 'post__in'. Accepts 1|true, 0|false.
 	 *                                                 Default 0|false.
 	 *     @type int          $m                       Combination YearMonth. Accepts any four-digit year and month
@@ -1492,11 +1498,14 @@ class WP_Query {
 	 *     @type int          $offset                  The number of posts to offset before retrieval.
 	 *     @type string       $order                   Designates ascending or descending order of posts. Default 'DESC'.
 	 *                                                 Accepts 'ASC', 'DESC'.
-	 *     @type string       $orderby                 Sort retrieved posts by parameter. One or more options can be
+	 *     @type string|array $orderby                 Sort retrieved posts by parameter. One or more options may be
 	 *                                                 passed. To use 'meta_value', or 'meta_value_num',
-	 *                                                 'meta_key=keyname' must be also be defined. Default 'date'.
-	 *                                                 Accepts 'none', 'name', 'author', 'date', 'title', 'modified',
-	 *                                                 'menu_order', 'parent', 'ID', 'rand', 'comment_count'.
+	 *                                                 'meta_key=keyname' must be also be defined. To sort by a
+	 *                                                 specific `$meta_query` clause, use that clause's array key.
+	 *                                                 Default 'date'. Accepts 'none', 'name', 'author', 'date',
+	 *                                                 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand',
+	 *                                                 'comment_count', 'meta_value', 'meta_value_num', and the
+	 *                                                 array keys of `$meta_query`.
 	 *     @type int          $p                       Post ID.
 	 *     @type int          $page                    Show the number of posts that would show up on page X of a
 	 *                                                 static front page.
@@ -1654,9 +1663,9 @@ class WP_Query {
 				$this->is_date = true;
 				if ( strlen($qv['m']) > 9 ) {
 					$this->is_time = true;
-				} else if ( strlen($qv['m']) > 7 ) {
+				} elseif ( strlen( $qv['m'] ) > 7 ) {
 					$this->is_day = true;
-				} else if ( strlen($qv['m']) > 5 ) {
+				} elseif ( strlen( $qv['m'] ) > 5 ) {
 					$this->is_month = true;
 				} else {
 					$this->is_year = true;
@@ -1827,7 +1836,7 @@ class WP_Query {
 	 *
 	 * @param array &$q The query variables
 	 */
-	function parse_tax_query( &$q ) {
+	public function parse_tax_query( &$q ) {
 		if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
 			$tax_query = $q['tax_query'];
 		} else {
@@ -1858,6 +1867,10 @@ class WP_Query {
 
 				$term = $q[$t->query_var];
 
+				if ( is_array( $term ) ) {
+					$term = implode( ',', $term );
+				}
+
 				if ( strpos($term, '+') !== false ) {
 					$terms = preg_split( '/[+]+/', $term );
 					foreach ( $terms as $term ) {
@@ -1956,7 +1969,7 @@ class WP_Query {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__in'][] = $tag;
 				}
-			} else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) {
+			} elseif ( 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');
@@ -2169,6 +2182,7 @@ class WP_Query {
 	 * 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.
 	 */
@@ -2214,7 +2228,7 @@ class WP_Query {
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $orderby Alias for the field to order by.
-	 * @return string|bool Table-prefixed value to used in the ORDER clause. False otherwise.
+	 * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
 	 */
 	protected function parse_orderby( $orderby ) {
 		global $wpdb;
@@ -2228,8 +2242,9 @@ class WP_Query {
 
 		$primary_meta_key = '';
 		$primary_meta_query = false;
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$primary_meta_query = reset( $this->meta_query->queries );
+		$meta_clauses = $this->meta_query->get_clauses();
+		if ( ! empty( $meta_clauses ) ) {
+			$primary_meta_query = reset( $meta_clauses );
 
 			if ( ! empty( $primary_meta_query['key'] ) ) {
 				$primary_meta_key = $primary_meta_query['key'];
@@ -2238,6 +2253,7 @@ class WP_Query {
 
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
+			$allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
 		}
 
 		if ( ! in_array( $orderby, $allowed_keys ) ) {
@@ -2255,29 +2271,36 @@ class WP_Query {
 			case 'ID':
 			case 'menu_order':
 			case 'comment_count':
-				$orderby = "$wpdb->posts.{$orderby}";
+				$orderby_clause = "$wpdb->posts.{$orderby}";
 				break;
 			case 'rand':
-				$orderby = 'RAND()';
+				$orderby_clause = 'RAND()';
 				break;
 			case $primary_meta_key:
 			case 'meta_value':
 				if ( ! empty( $primary_meta_query['type'] ) ) {
-					$sql_type = $this->meta_query->get_cast_for_type( $primary_meta_query['type'] );
-					$orderby = "CAST($wpdb->postmeta.meta_value AS {$sql_type})";
+					$orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
 				} else {
-					$orderby = "$wpdb->postmeta.meta_value";
+					$orderby_clause = "{$primary_meta_query['alias']}.meta_value";
 				}
 				break;
 			case 'meta_value_num':
-				$orderby = "$wpdb->postmeta.meta_value+0";
+				$orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
 				break;
 			default:
-				$orderby = "$wpdb->posts.post_" . $orderby;
+				if ( array_key_exists( $orderby, $meta_clauses ) ) {
+					// $orderby corresponds to a meta_query clause.
+					$meta_clause = $meta_clauses[ $orderby ];
+					$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
+				} else {
+					// Default: order by post field.
+					$orderby_clause = "$wpdb->posts.post_" . sanitize_key( $orderby );
+				}
+
 				break;
 		}
 
-		return $orderby;
+		return $orderby_clause;
 	}
 
 	/**
@@ -2341,7 +2364,7 @@ class WP_Query {
 	 * @access public
 	 *
 	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
+	 * @param mixed  $value     Query variable value.
 	 */
 	public function set($query_var, $value) {
 		$this->query_vars[$query_var] = $value;
@@ -2356,6 +2379,8 @@ class WP_Query {
 	 * @since 1.5.0
 	 * @access public
 	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @return array List of posts.
 	 */
 	public function get_posts() {
@@ -2467,7 +2492,7 @@ class WP_Query {
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
 		if ( $q['posts_per_page'] < -1 )
 			$q['posts_per_page'] = abs($q['posts_per_page']);
-		else if ( $q['posts_per_page'] == 0 )
+		elseif ( $q['posts_per_page'] == 0 )
 			$q['posts_per_page'] = 1;
 
 		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
@@ -2808,6 +2833,12 @@ class WP_Query {
 
 		$where .= $search . $whichauthor . $whichmimetype;
 
+		if ( ! empty( $this->meta_query->queries ) ) {
+			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+			$join   .= $clauses['join'];
+			$where  .= $clauses['where'];
+		}
+
 		$rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
 		if ( ! isset( $q['order'] ) ) {
 			$q['order'] = $rand ? '' : 'DESC';
@@ -2943,6 +2974,7 @@ class WP_Query {
 
 		$user_id = get_current_user_id();
 
+		$q_status = array();
 		if ( ! empty( $q['post_status'] ) ) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
@@ -3025,12 +3057,6 @@ class WP_Query {
 			$where .= ')';
 		}
 
-		if ( !empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
-			$join .= $clauses['join'];
-			$where .= $clauses['where'];
-		}
-
 		/*
 		 * Apply filters on where and join prior to paging so that any
 		 * manipulations to them are reflected in the paging by day queries.
@@ -3406,10 +3432,11 @@ class WP_Query {
 
 		if ( 'ids' == $q['fields'] ) {
 			$this->posts = $wpdb->get_col( $this->request );
+			$this->posts = array_map( 'intval', $this->posts );
 			$this->post_count = count( $this->posts );
 			$this->set_found_posts( $q, $limits );
 
-			return array_map( 'intval', $this->posts );
+			return $this->posts;
 		}
 
 		if ( 'id=>parent' == $q['fields'] ) {
@@ -3418,9 +3445,13 @@ class WP_Query {
 			$this->set_found_posts( $q, $limits );
 
 			$r = array();
-			foreach ( $this->posts as $post ) {
+			foreach ( $this->posts as $key => $post ) {
+				$this->posts[ $key ]->ID = (int) $post->ID;
+				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
+
 				$r[ (int) $post->ID ] = (int) $post->post_parent;
 			}
+
 			return $r;
 		}
 
@@ -3513,7 +3544,10 @@ class WP_Query {
 			$status = get_post_status($this->posts[0]);
 			$post_status_obj = get_post_status_object($status);
 			//$type = get_post_type($this->posts[0]);
-			if ( !$post_status_obj->public ) {
+
+			// If the post_status was specifically requested, let it pass through.
+			if ( !$post_status_obj->public && ! in_array( $status, $q_status ) ) {
+
 				if ( ! is_user_logged_in() ) {
 					// User must be logged in to view unpublished posts.
 					$this->posts = array();
@@ -3628,6 +3662,8 @@ class WP_Query {
 	 *
 	 * @since 3.5.0
 	 * @access private
+	 *
+	 * @global wpdb $wpdb
 	 */
 	private function set_found_posts( $q, $limits ) {
 		global $wpdb;
@@ -3689,6 +3725,8 @@ class WP_Query {
 	 *
 	 * @since 1.5.0
 	 * @access public
+	 *
+	 * @global WP_Post $post
 	 */
 	public function the_post() {
 		global $post;
@@ -3872,15 +3910,17 @@ class WP_Query {
 				// For other tax queries, grab the first term from the first clause.
 				$tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' );
 
-				$queried_taxonomies = array_keys( $tax_query_in_and );
-				$matched_taxonomy = reset( $queried_taxonomies );
-				$query = $tax_query_in_and[ $matched_taxonomy ];
+				if ( ! empty( $tax_query_in_and ) ) {
+					$queried_taxonomies = array_keys( $tax_query_in_and );
+					$matched_taxonomy = reset( $queried_taxonomies );
+					$query = $tax_query_in_and[ $matched_taxonomy ];
 
-				if ( $query['terms'] ) {
-					if ( 'term_id' == $query['field'] ) {
-						$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
-					} else {
-						$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+					if ( $query['terms'] ) {
+						if ( 'term_id' == $query['field'] ) {
+							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+						} else {
+							$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+						}
 					}
 				}
 			}
@@ -3938,8 +3978,7 @@ class WP_Query {
 	 * @since 1.5.0
 	 * @access public
 	 *
-	 * @param string $query URL query string.
-	 * @return WP_Query
+	 * @param string|array $query URL query string or array of vars.
 	 */
 	public function __construct($query = '') {
 		if ( ! empty($query) ) {
@@ -3957,11 +3996,13 @@ class WP_Query {
 	 * @return mixed Property.
 	 */
 	public function __get( $name ) {
-		return $this->$name;
+		if ( in_array( $name, $this->compat_fields ) ) {
+			return $this->$name;
+		}
 	}
 
 	/**
-	 * Make private properties settable for backwards compatibility.
+	 * Make private properties checkable for backwards compatibility.
 	 *
 	 * @since 4.0.0
 	 * @access public
@@ -3970,19 +4011,9 @@ class WP_Query {
 	 * @return bool Whether the property is set.
 	 */
 	public function __isset( $name ) {
-		return isset( $this->$name );
-	}
-
-	/**
-	 * Make private properties settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to unset.
-	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+		if ( in_array( $name, $this->compat_fields ) ) {
+			return isset( $this->$name );
+		}
 	}
 
 	/**
@@ -3993,10 +4024,13 @@ class WP_Query {
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
-	 * @return mixed|bool Return value of the callback, otherwise false.
+	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
 	public function __call( $name, $arguments ) {
-		return call_user_func_array( array( $this, $name ), $arguments );
+		if ( in_array( $name, $this->compat_methods ) ) {
+			return call_user_func_array( array( $this, $name ), $arguments );
+		}
+		return false;
 	}
 
 	/**
@@ -4053,7 +4087,7 @@ class WP_Query {
 
 		$post_obj = $this->get_queried_object();
 
-		if ( in_array( $post_obj->ID, $attachment ) ) {
+		if ( in_array( (string) $post_obj->ID, $attachment ) ) {
 			return true;
 		} elseif ( in_array( $post_obj->post_title, $attachment ) ) {
 			return true;
@@ -4085,7 +4119,7 @@ class WP_Query {
 
 		$author = (array) $author;
 
-		if ( in_array( $author_obj->ID, $author ) )
+		if ( in_array( (string) $author_obj->ID, $author ) )
 			return true;
 		elseif ( in_array( $author_obj->nickname, $author ) )
 			return true;
@@ -4117,7 +4151,7 @@ class WP_Query {
 
 		$category = (array) $category;
 
-		if ( in_array( $cat_obj->term_id, $category ) )
+		if ( in_array( (string) $cat_obj->term_id, $category ) )
 			return true;
 		elseif ( in_array( $cat_obj->name, $category ) )
 			return true;
@@ -4149,7 +4183,7 @@ class WP_Query {
 
 		$tag = (array) $tag;
 
-		if ( in_array( $tag_obj->term_id, $tag ) )
+		if ( in_array( (string) $tag_obj->term_id, $tag ) )
 			return true;
 		elseif ( in_array( $tag_obj->name, $tag ) )
 			return true;
@@ -4171,8 +4205,10 @@ class WP_Query {
 	 *
 	 * @since 3.1.0
 	 *
+	 * @global array $wp_taxonomies
+	 *
 	 * @param mixed $taxonomy Optional. Taxonomy slug or slugs.
-	 * @param mixed $term. Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
+	 * @param mixed $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
 	 * @return bool
 	 */
 	public function is_tax( $taxonomy = '', $term = '' ) {
@@ -4346,11 +4382,11 @@ class WP_Query {
 
 		$page = (array) $page;
 
-		if ( in_array( $page_obj->ID, $page ) ) {
+		if ( in_array( (string) $page_obj->ID, $page ) ) {
 			return true;
 		} elseif ( in_array( $page_obj->post_title, $page ) ) {
 			return true;
-		} else if ( in_array( $page_obj->post_name, $page ) ) {
+		} elseif ( in_array( $page_obj->post_name, $page ) ) {
 			return true;
 		} else {
 			foreach ( $page as $pagepath ) {
@@ -4439,7 +4475,7 @@ class WP_Query {
 
 		$post = (array) $post;
 
-		if ( in_array( $post_obj->ID, $post ) ) {
+		if ( in_array( (string) $post_obj->ID, $post ) ) {
 			return true;
 		} elseif ( in_array( $post_obj->post_title, $post ) ) {
 			return true;
@@ -4532,6 +4568,8 @@ class WP_Query {
 	 *
 	 * @since 3.3.0
 	 *
+	 * @global WP_Query $wp_query
+	 *
 	 * @return bool
 	 */
 	public function is_main_query() {
@@ -4544,8 +4582,18 @@ class WP_Query {
 	 *
 	 * @since 4.1.0
 	 *
+	 * @global int             $id
+	 * @global WP_User         $authordata
+	 * @global string|int|bool $currentday
+	 * @global string|int|bool $currentmonth
+	 * @global int             $page
+	 * @global array           $pages
+	 * @global int             $multipage
+	 * @global int             $more
+	 * @global int             $numpages
+	 *
 	 * @param WP_Post $post Post data.
-	 * @return bool True when finished.
+	 * @return true True when finished.
 	 */
 	public function setup_postdata( $post ) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
@@ -4568,7 +4616,7 @@ class WP_Query {
 		 */
 		if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
 			$more = 1;
-		} else if ( $this->is_feed() ) {
+		} elseif ( $this->is_feed() ) {
 			$more = 1;
 		} else {
 			$more = 0;
@@ -4612,6 +4660,8 @@ class WP_Query {
 	 * restores the $post global to the current post in this query.
 	 *
 	 * @since 3.7.0
+	 *
+	 * @global WP_Post $post
 	 */
 	public function reset_postdata() {
 		if ( ! empty( $this->post ) ) {
@@ -4628,10 +4678,8 @@ class WP_Query {
  *
  * @since 2.1.0
  *
- * @uses $wp_query
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @return null If no link is found, null is returned.
+ * @global WP_Query $wp_query
+ * @global wpdb     $wpdb     WordPress database abstraction object.
  */
 function wp_old_slug_redirect() {
 	global $wp_query;
@@ -4649,7 +4697,7 @@ function wp_old_slug_redirect() {
 		if ( is_array( $post_type ) ) {
 			if ( count( $post_type ) > 1 )
 				return;
-			$post_type = array_shift( $post_type );
+			$post_type = reset( $post_type );
 		}
 
 		// Do not attempt redirect for hierarchical post types
@@ -4687,6 +4735,8 @@ function wp_old_slug_redirect() {
  *
  * @since 1.5.0
  *
+ * @global WP_Query $wp_query
+ *
  * @param object $post Post data.
  * @return bool True when finished.
  */