site_iri: comparison web/wp-includes/query.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 	return $wp_query->get($var);
 }
 /**
+* Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
+*
+* @uses WP_Query::get_queried_object
+*
+* @since 3.1.0
+* @access public
+*
+* @return object
+*/
+function get_queried_object() {
+	global $wp_query;
+	return $wp_query->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
+*
+* @return int
+*/
+function get_queried_object_id() {
+	global $wp_query;
+	return $wp_query->get_queried_object_id();
+}
+/**
 * Set query variable.
 *
 * @see WP_Query::set()
 * @since 2.2.0
 * @uses $wp_query
 	return $wp_query->set($var, $value);
 }
 /**
-* Setup The Loop with query parameters.
+* Set up The Loop with query parameters.
 *
 * This will override the current WordPress Loop and shouldn't be used more than
 * once. This must not be used within the WordPress Loop.
 *
 * @since 1.5.0
 * @param string $query
 * @return array List of posts
 */
 function &query_posts($query) {
 	unset($GLOBALS['wp_query']);
-	$GLOBALS['wp_query'] =& new WP_Query();
+	$GLOBALS['wp_query'] = new WP_Query();
 	return $GLOBALS['wp_query']->query($query);
 }
 /**
-* Destroy the previous query and setup a new query.
+* Destroy the previous query and set up a new query.
 *
 * This should be used after {@link query_posts()} and before another {@link
 * query_posts()}. This will remove obscure bugs that occur when the previous
-* wp_query object is not destroyed properly before another is setup.
+* wp_query object is not destroyed properly before another is set up.
 *
 * @since 2.3.0
 * @uses $wp_query
 */
 function wp_reset_query() {
 	unset($GLOBALS['wp_query']);
-	$GLOBALS['wp_query'] =& $GLOBALS['wp_the_query'];
+	$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
+	wp_reset_postdata();
+}
+/**
+* After looping through a separate query, this function restores
+* 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;
 	if ( !empty($wp_query->post) ) {
 		$GLOBALS['post'] = $wp_query->post;
 		setup_postdata($wp_query->post);
 	}
 /*
 * Query type checks.
 */
 /**
-* Is query requesting an archive page.
+* Is the query for an archive page?
 *
+* Month, Year, Category, Author, Post Type archive...
+*
+* @see WP_Query::is_archive()
 * @since 1.5.0
 * @uses $wp_query
 *
-* @return bool True if page is archive.
+* @return bool
 */
-function is_archive () {
+function is_archive() {
 	global $wp_query;
-	return $wp_query->is_archive;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Is query requesting an attachment page.
-*
+	return $wp_query->is_archive();
+}
+/**
+* Is the query for a 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.
+* @return bool
+*/
+function is_post_type_archive( $post_types = '' ) {
+	global $wp_query;
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
+	}
+	return $wp_query->is_post_type_archive( $post_types );
+}
+/**
+* Is the query for an attachment page?
+*
+* @see WP_Query::is_attachment()
 * @since 2.0.0
 * @uses $wp_query
 *
-* @return bool True if page is attachment.
+* @return bool
 */
-function is_attachment () {
+function is_attachment() {
 	global $wp_query;
-	return $wp_query->is_attachment;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Is query requesting an author page.
-*
+	return $wp_query->is_attachment();
-* If the $author parameter is specified then the check will be expanded to
+}
-* include whether the queried author matches the one given in the parameter.
-* You can match against integers and against strings.
+/**
-*
+* Is the query for an author archive page?
-* If matching against an integer, the ID should be used of the author for the
+*
-* test. If the $author is an ID and matches the author page user ID, then
+* If the $author parameter is specified, this function will additionally
-* 'true' will be returned.
+* check if the query is for one of the authors specified.
 *
-* If matching against strings, then the test will be matched against both the
+* @see WP_Query::is_author()
-* nickname and user nicename and will return true on success.
-*
 * @since 1.5.0
 * @uses $wp_query
 *
-* @param string|int $author Optional. Is current page this author.
+* @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
-* @return bool True if page is author or $author (if set).
+* @return bool
 */
-function is_author ($author = '') {
+function is_author( $author = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_author )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty($author) )
-		return true;
+	return $wp_query->is_author( $author );
+}
-	$author_obj = $wp_query->get_queried_object();
+/**
-	$author = (array) $author;
+* Is the query for a category archive page?
+*
-	if ( in_array( $author_obj->ID, $author ) )
+* If the $category parameter is specified, this function will additionally
-		return true;
+* check if the query is for one of the categories specified.
-	elseif ( in_array( $author_obj->nickname, $author ) )
+*
-		return true;
+* @see WP_Query::is_category()
-	elseif ( in_array( $author_obj->user_nicename, $author ) )
-		return true;
-	return false;
-}
-/**
-* Whether current page query contains a category name or given category name.
-*
-* The category list can contain category IDs, names, or category slugs. If any
-* of them are part of the query, then it will return true.
-*
 * @since 1.5.0
 * @uses $wp_query
 *
-* @param string|array $category Optional.
+* @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
 * @return bool
 */
-function is_category ($category = '') {
+function is_category( $category = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_category )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty($category) )
-		return true;
+	return $wp_query->is_category( $category );
+}
-	$cat_obj = $wp_query->get_queried_object();
+/**
-	$category = (array) $category;
+* Is the query for a tag archive page?
+*
-	if ( in_array( $cat_obj->term_id, $category ) )
+* If the $tag parameter is specified, this function will additionally
-		return true;
+* check if the query is for one of the tags specified.
-	elseif ( in_array( $cat_obj->name, $category ) )
+*
-		return true;
+* @see WP_Query::is_tag()
-	elseif ( in_array( $cat_obj->slug, $category ) )
-		return true;
-	return false;
-}
-/**
-* Whether the current page query has the given tag slug or contains tag.
-*
 * @since 2.3.0
 * @uses $wp_query
 *
-* @param string|array $slug Optional. Single tag or list of tags to check for.
+* @param mixed $slug Optional. Tag slug or array of slugs.
 * @return bool
 */
 function is_tag( $slug = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_tag )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty( $slug ) )
-		return true;
+	return $wp_query->is_tag( $slug );
+}
-	$tag_obj = $wp_query->get_queried_object();
+/**
-	$slug = (array) $slug;
+* Is the query for a taxonomy archive page?
+*
-	if ( in_array( $tag_obj->slug, $slug ) )
+* If the $taxonomy parameter is specified, this function will additionally
-		return true;
+* check if the query is for that specific $taxonomy.
+*
-	return false;
+* If the $term parameter is specified in addition to the $taxonomy parameter,
-}
+* this function will additionally check if the query is for one of the terms
+* specified.
-/**
+*
-* Whether the current page query has the given taxonomy slug or contains taxonomy.
+* @see WP_Query::is_tax()
-*
 * @since 2.5.0
 * @uses $wp_query
 *
-* @param string|array $slug Optional. Slug or slugs to check in current query.
+* @param mixed $taxonomy Optional. Taxonomy slug or slugs.
+* @param mixed $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
 * @return bool
 */
-function is_tax( $slug = '' ) {
+function is_tax( $taxonomy = '', $term = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_tax )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty($slug) )
-		return true;
+	return $wp_query->is_tax( $taxonomy, $term );
-	return in_array( get_query_var('taxonomy'), (array) $slug );
 }
 /**
 * Whether the current URL is within the comments popup window.
 *
+* @see WP_Query::is_comments_popup()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_comments_popup () {
+function is_comments_popup() {
 	global $wp_query;
-	return $wp_query->is_comments_popup;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current URL is based on a date.
-*
+	return $wp_query->is_comments_popup();
+}
+/**
+* Is the query for a date archive?
+*
+* @see WP_Query::is_date()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_date () {
+function is_date() {
 	global $wp_query;
-	return $wp_query->is_date;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current blog URL contains a day.
-*
+	return $wp_query->is_date();
+}
+/**
+* Is the query for a day archive?
+*
+* @see WP_Query::is_day()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_day () {
+function is_day() {
 	global $wp_query;
-	return $wp_query->is_day;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current page query is feed URL.
-*
+	return $wp_query->is_day();
+}
+/**
+* Is the query for a feed?
+*
+* @see WP_Query::is_feed()
 * @since 1.5.0
 * @uses $wp_query
 *
+* @param string|array $feeds Optional feed types to check.
 * @return bool
 */
-function is_feed () {
+function is_feed( $feeds = '' ) {
 	global $wp_query;
-	return $wp_query->is_feed;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current page query is the front of the site.
-*
+	return $wp_query->is_feed( $feeds );
+}
+/**
+* Is the query for a comments feed?
+*
+* @see WP_Query::is_comments_feed()
+* @since 3.0.0
+* @uses $wp_query
+*
+* @return bool
+*/
+function is_comment_feed() {
+	global $wp_query;
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
+	}
+	return $wp_query->is_comment_feed();
+}
+/**
+* Is the query for the front page of the site?
+*
+* This is for what is displayed at your site's main URL.
+*
+* Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_on_front'.
+*
+* If you set a static page for the front page of your site, this function will return
+* true when viewing that page.
+*
+* Otherwise the same as @see is_home()
+*
+* @see WP_Query::is_front_page()
 * @since 2.5.0
 * @uses is_home()
 * @uses get_option()
 *
 * @return bool True, if front of site.
 */
-function is_front_page () {
+function is_front_page() {
-	// most likely case
+	global $wp_query;
-	if ( 'posts' == get_option('show_on_front') && is_home() )
-		return true;
+	if ( ! isset( $wp_query ) ) {
-	elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') && is_page(get_option('page_on_front')) )
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
-		return true;
-	else
 		return false;
-}
+	}
-/**
+	return $wp_query->is_front_page();
-* Whether current page view is the blog homepage.
+}
-*
+/**
+* Is the query for the blog homepage?
+*
+* This is the page which shows the time based blog content of your site.
+*
+* Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_for_posts'.
+*
+* If you set a static page for the front page of your site, this function will return
+* true only on the page you set as the "Posts page".
+*
+* @see is_front_page()
+*
+* @see WP_Query::is_home()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool True if blog view homepage.
 */
-function is_home () {
+function is_home() {
 	global $wp_query;
-	return $wp_query->is_home;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current page query contains a month.
-*
+	return $wp_query->is_home();
+}
+/**
+* Is the query for a month archive?
+*
+* @see WP_Query::is_month()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_month () {
+function is_month() {
 	global $wp_query;
-	return $wp_query->is_month;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether query is page or contains given page(s).
-*
+	return $wp_query->is_month();
-* Calls the function without any parameters will only test whether the current
+}
-* query is of the page type. Either a list or a single item can be tested
-* against for whether the query is a page and also is the value or one of the
+/**
-* values in the page parameter.
+* Is the query for a single page?
 *
-* The parameter can contain the page ID, page title, or page name. The
+* If the $page parameter is specified, this function will additionally
-* parameter can also be an array of those three values.
+* check if the query is for one of the pages specified.
 *
+* @see is_single()
+* @see is_singular()
+*
+* @see WP_Query::is_page()
 * @since 1.5.0
 * @uses $wp_query
 *
-* @param mixed $page Either page or list of pages to test against.
+* @param mixed $page Page ID, title, slug, or array of such.
 * @return bool
 */
-function is_page ($page = '') {
+function is_page( $page = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_page )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty($page) )
-		return true;
+	return $wp_query->is_page( $page );
+}
-	$page_obj = $wp_query->get_queried_object();
+/**
-	$page = (array) $page;
+* Is the query for paged result and not for the first page?
+*
-	if ( in_array( $page_obj->ID, $page ) )
+* @see WP_Query::is_paged()
-		return true;
-	elseif ( in_array( $page_obj->post_title, $page ) )
-		return true;
-	else if ( in_array( $page_obj->post_name, $page ) )
-		return true;
-	return false;
-}
-/**
-* Whether query contains multiple pages for the results.
-*
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_paged () {
+function is_paged() {
 	global $wp_query;
-	return $wp_query->is_paged;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the current page was created by a plugin.
-*
+	return $wp_query->is_paged();
-* The plugin can set this by using the global $plugin_page and setting it to
+}
-* true.
-*
+/**
-* @since 1.5.0
+* Is the query for a post or page preview?
-* @global bool $plugin_page Used by plugins to tell the query that current is a plugin page.
+*
-*
+* @see WP_Query::is_preview()
-* @return bool
-*/
-function is_plugin_page() {
-	global $plugin_page;
-	if ( isset($plugin_page) )
-		return true;
-	return false;
-}
-/**
-* Whether the current query is preview of post or page.
-*
 * @since 2.0.0
 * @uses $wp_query
 *
 * @return bool
 */
 function is_preview() {
 	global $wp_query;
-	return $wp_query->is_preview;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the current query post is robots.
-*
+	return $wp_query->is_preview();
+}
+/**
+* Is the query for the robots file?
+*
+* @see WP_Query::is_robots()
 * @since 2.1.0
 * @uses $wp_query
 *
 * @return bool
 */
 function is_robots() {
 	global $wp_query;
-	return $wp_query->is_robots;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current query is the result of a user search.
-*
+	return $wp_query->is_robots();
+}
+/**
+* Is the query for a search?
+*
+* @see WP_Query::is_search()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_search () {
+function is_search() {
 	global $wp_query;
-	return $wp_query->is_search;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the current page query is single page.
-*
+	return $wp_query->is_search();
-* The parameter can contain the post ID, post title, or post name. The
+}
-* parameter can also be an array of those three values.
-*
+/**
-* This applies to other post types, attachments, pages, posts. Just means that
+* Is the query for a single post?
-* the current query has only a single object.
+*
-*
+* Works for any post type, except attachments and pages
+*
+* If the $post parameter is specified, this function will additionally
+* check if the query is for one of the Posts specified.
+*
+* @see is_page()
+* @see is_singular()
+*
+* @see WP_Query::is_single()
 * @since 1.5.0
 * @uses $wp_query
 *
-* @param mixed $post Either post or list of posts to test against.
+* @param mixed $post Post ID, title, slug, or array of such.
 * @return bool
 */
-function is_single ($post = '') {
+function is_single( $post = '' ) {
 	global $wp_query;
-	if ( !$wp_query->is_single )
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
 		return false;
+	}
-	if ( empty( $post) )
-		return true;
+	return $wp_query->is_single( $post );
+}
-	$post_obj = $wp_query->get_queried_object();
+/**
-	$post = (array) $post;
+* Is the query for a single post of any post type (post, attachment, page, ... )?
+*
-	if ( in_array( $post_obj->ID, $post ) )
+* If the $post_types parameter is specified, this function will additionally
-		return true;
+* check if the query is for one of the Posts Types specified.
-	elseif ( in_array( $post_obj->post_title, $post ) )
+*
-		return true;
+* @see is_page()
-	elseif ( in_array( $post_obj->post_name, $post ) )
+* @see is_single()
-		return true;
+*
+* @see WP_Query::is_singular()
-	return false;
-}
-/**
-* Whether is single post, is a page, or is an attachment.
-*
 * @since 1.5.0
 * @uses $wp_query
 *
+* @param mixed $post_types Optional. Post Type or array of Post Types
 * @return bool
 */
-function is_singular() {
+function is_singular( $post_types = '' ) {
 	global $wp_query;
-	return $wp_query->is_singular;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the query contains a time.
-*
+	return $wp_query->is_singular( $post_types );
+}
+/**
+* Is the query for a specific time?
+*
+* @see WP_Query::is_time()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_time () {
+function is_time() {
 	global $wp_query;
-	return $wp_query->is_time;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the query is a trackback.
-*
+	return $wp_query->is_time();
+}
+/**
+* Is the query for a trackback endpoint call?
+*
+* @see WP_Query::is_trackback()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_trackback () {
+function is_trackback() {
 	global $wp_query;
-	return $wp_query->is_trackback;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether the query contains a year.
-*
+	return $wp_query->is_trackback();
+}
+/**
+* Is the query for a specific year?
+*
+* @see WP_Query::is_year()
 * @since 1.5.0
 * @uses $wp_query
 *
 * @return bool
 */
-function is_year () {
+function is_year() {
 	global $wp_query;
-	return $wp_query->is_year;
+	if ( ! isset( $wp_query ) ) {
-}
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
-/**
+	}
-* Whether current page query is a 404 and no results for WordPress query.
-*
+	return $wp_query->is_year();
+}
+/**
+* Is the query a 404 (returns no results)?
+*
+* @see WP_Query::is_404()
 * @since 1.5.0
 * @uses $wp_query
 *
-* @return bool True, if nothing is found matching WordPress Query.
+* @return bool
 */
-function is_404 () {
+function is_404() {
 	global $wp_query;
-	return $wp_query->is_404;
+	if ( ! isset( $wp_query ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+		return false;
+	}
+	return $wp_query->is_404();
+}
+/**
+* Is the query the main query?
+*
+* @since 3.3.0
+*
+* @return bool
+*/
+function is_main_query() {
+	global $wp_query;
+	return $wp_query->is_main_query();
 }
 /*
-* The Loop.  Post loop control.
+* The Loop. Post loop control.
 */
 /**
 * Whether current WordPress query has results to loop over.
 *
 * @since 1.5.0
 */
 class WP_Query {
 	/**
-	 * Query string
+	 * Query vars set by the user
 	 *
 	 * @since 1.5.0
+	 * @access public
+	 * @var array
+	 */
+	var $query;
+	/**
+	 * Query vars, after parsing
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var array
+	 */
+	var $query_vars = array();
+	/**
+	 * Taxonomy query, as passed to get_tax_sql()
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 * @var object WP_Tax_Query
+	 */
+	var $tax_query;
+	/**
+	 * Metadata query container
+	 *
+	 * @since 3.2.0
+	 * @access public
+	 * @var object WP_Meta_Query
+	 */
+	var $meta_query = false;
+	/**
+	 * Holds the data for a single object that is queried.
+	 *
+	 * Holds the contents of a post, page, category, attachment.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var object|array
+	 */
+	var $queried_object;
+	/**
+	 * The ID of the queried object.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var int
+	 */
+	var $queried_object_id;
+	/**
+	 * Get post database query.
+	 *
+	 * @since 2.0.1
 	 * @access public
 	 * @var string
 	 */
-	var $query;
+	var $request;
 	/**
-	 * Query search variables set by the user.
+	 * List of posts.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 * @var array
 	 */
-	var $query_vars = array();
+	var $posts;
 	/**
-	 * Holds the data for a single object that is queried.
+	 * The amount of posts for the current query.
-	 *
-	 * Holds the contents of a post, page, category, attachment.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var object|array
-	 */
-	var $queried_object;
-	/**
-	 * The ID of the queried object.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 * @var int
 	 */
-	var $queried_object_id;
+	var $post_count = 0;
 	/**
-	 * Get post database query.
+	 * Index of the current item in the loop.
 	 *
-	 * @since 2.0.1
+	 * @since 1.5.0
 	 * @access public
-	 * @var string
+	 * @var int
 	 */
-	var $request;
+	var $current_post = -1;
 	/**
-	 * List of posts.
+	 * Whether the loop has started and the caller is in the loop.
 	 *
-	 * @since 1.5.0
+	 * @since 2.0.0
+	 * @access public
+	 * @var bool
+	 */
+	var $in_the_loop = false;
+	/**
+	 * The current post ID.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var object
+	 */
+	var $post;
+	/**
+	 * The list of comments for current post.
+	 *
+	 * @since 2.2.0
 	 * @access public
 	 * @var array
 	 */
-	var $posts;
+	var $comments;
 	/**
-	 * The amount of posts for the current query.
+	 * The amount of comments for the posts.
 	 *
-	 * @since 1.5.0
+	 * @since 2.2.0
 	 * @access public
 	 * @var int
 	 */
-	var $post_count = 0;
+	var $comment_count = 0;
 	/**
-	 * Index of the current item in the loop.
+	 * The index of the comment in the comment loop.
 	 *
-	 * @since 1.5.0
+	 * @since 2.2.0
 	 * @access public
 	 * @var int
 	 */
-	var $current_post = -1;
+	var $current_comment = -1;
 	/**
-	 * Whether the loop has started and the caller is in the loop.
+	 * Current comment ID.
+	 *
+	 * @since 2.2.0
+	 * @access public
+	 * @var int
+	 */
+	var $comment;
+	/**
+	 * Amount of posts if limit clause was not used.
+	 *
+	 * @since 2.1.0
+	 * @access public
+	 * @var int
+	 */
+	var $found_posts = 0;
+	/**
+	 * The amount of pages.
+	 *
+	 * @since 2.1.0
+	 * @access public
+	 * @var int
+	 */
+	var $max_num_pages = 0;
+	/**
+	 * The amount of comment pages.
+	 *
+	 * @since 2.7.0
+	 * @access public
+	 * @var int
+	 */
+	var $max_num_comment_pages = 0;
+	/**
+	 * Set if query is single post.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_single = false;
+	/**
+	 * Set if query is preview of blog.
 	 *
 	 * @since 2.0.0
 	 * @access public
 	 * @var bool
 	 */
-	var $in_the_loop = false;
+	var $is_preview = false;
 	/**
-	 * The current post ID.
+	 * Set if query returns a page.
 	 *
 	 * @since 1.5.0
 	 * @access public
-	 * @var int
+	 * @var bool
 	 */
-	var $post;
+	var $is_page = false;
 	/**
-	 * The list of comments for current post.
+	 * Set if query is an archive list.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_archive = false;
+	/**
+	 * Set if query is part of a date.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_date = false;
+	/**
+	 * Set if query contains a year.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_year = false;
+	/**
+	 * Set if query contains a month.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_month = false;
+	/**
+	 * Set if query contains a day.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_day = false;
+	/**
+	 * Set if query contains time.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_time = false;
+	/**
+	 * Set if query contains an author.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_author = false;
+	/**
+	 * Set if query contains category.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_category = false;
+	/**
+	 * Set if query contains tag.
+	 *
+	 * @since 2.3.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_tag = false;
+	/**
+	 * Set if query contains taxonomy.
+	 *
+	 * @since 2.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_tax = false;
+	/**
+	 * Set if query was part of a search result.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_search = false;
+	/**
+	 * Set if query is feed display.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_feed = false;
+	/**
+	 * Set if query is comment feed display.
 	 *
 	 * @since 2.2.0
 	 * @access public
-	 * @var array
+	 * @var bool
 	 */
-	var $comments;
+	var $is_comment_feed = false;
 	/**
-	 * The amount of comments for the posts.
+	 * Set if query is trackback.
 	 *
-	 * @since 2.2.0
+	 * @since 1.5.0
 	 * @access public
-	 * @var int
+	 * @var bool
 	 */
-	var $comment_count = 0;
+	var $is_trackback = false;
 	/**
-	 * The index of the comment in the comment loop.
+	 * Set if query is blog homepage.
 	 *
-	 * @since 2.2.0
+	 * @since 1.5.0
 	 * @access public
-	 * @var int
+	 * @var bool
 	 */
-	var $current_comment = -1;
+	var $is_home = false;
 	/**
-	 * Current comment ID.
+	 * Set if query couldn't found anything.
 	 *
-	 * @since 2.2.0
+	 * @since 1.5.0
 	 * @access public
-	 * @var int
+	 * @var bool
 	 */
-	var $comment;
+	var $is_404 = false;
 	/**
-	 * Amount of posts if limit clause was not used.
+	 * Set if query is within comments popup window.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_comments_popup = false;
+	/**
+	 * Set if query is paged
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_paged = false;
+	/**
+	 * Set if query is part of administration page.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_admin = false;
+	/**
+	 * Set if query is an attachment.
+	 *
+	 * @since 2.0.0
+	 * @access public
+	 * @var bool
+	 */
+	var $is_attachment = false;
+	/**
+	 * Set if is single, is a page, or is an attachment.
 	 *
 	 * @since 2.1.0
 	 * @access public
-	 * @var int
+	 * @var bool
 	 */
-	var $found_posts = 0;
+	var $is_singular = false;
 	/**
-	 * The amount of pages.
+	 * Set if query is for robots.
 	 *
 	 * @since 2.1.0
 	 * @access public
-	 * @var int
-	 */
-	var $max_num_pages = 0;
-	/**
-	 * The amount of comment pages.
-	 *
-	 * @since 2.7.0
-	 * @access public
-	 * @var int
-	 */
-	var $max_num_comment_pages = 0;
-	/**
-	 * Set if query is single post.
-	 *
-	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
-	var $is_single = false;
+	var $is_robots = false;
 	/**
-	 * Set if query is preview of blog.
+	 * Set if query contains posts.
 	 *
-	 * @since 2.0.0
+	 * Basically, the homepage if the option isn't set for the static homepage.
+	 *
+	 * @since 2.1.0
 	 * @access public
 	 * @var bool
 	 */
-	var $is_preview = false;
+	var $is_posts_page = false;
 	/**
-	 * Set if query returns a page.
+	 * Set if query is for a post type archive.
 	 *
-	 * @since 1.5.0
+	 * @since 3.1.0
 	 * @access public
 	 * @var bool
 	 */
-	var $is_page = false;
+	var $is_post_type_archive = false;
 	/**
-	 * Set if query is an archive list.
+	 * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know
-	 *
+	 * whether we have to re-parse because something has changed
-	 * @since 1.5.0
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 */
+	var $query_vars_hash = false;
+	/**
+	 * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
+	 * via pre_get_posts hooks.
+	 *
+	 * @since 3.1.1
+	 * @access private
+	 */
+	var $query_vars_changed = true;
+	/**
+	 * Set if post thumbnails are cached
+	 *
+	 * @since 3.2.0
 	 * @access public
 	 * @var bool
 	 */
-	var $is_archive = false;
+	 var $thumbnails_cached = false;
-	/**
-	 * Set if query is part of a date.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_date = false;
-	/**
-	 * Set if query contains a year.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_year = false;
-	/**
-	 * Set if query contains a month.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_month = false;
-	/**
-	 * Set if query contains a day.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_day = false;
-	/**
-	 * Set if query contains time.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_time = false;
-	/**
-	 * Set if query contains an author.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_author = false;
-	/**
-	 * Set if query contains category.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_category = false;
-	/**
-	 * Set if query contains tag.
-	 *
-	 * @since 2.3.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_tag = false;
-	/**
-	 * Set if query contains taxonomy.
-	 *
-	 * @since 2.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_tax = false;
-	/**
-	 * Set if query was part of a search result.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_search = false;
-	/**
-	 * Set if query is feed display.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_feed = false;
-	/**
-	 * Set if query is comment feed display.
-	 *
-	 * @since 2.2.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_comment_feed = false;
-	/**
-	 * Set if query is trackback.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_trackback = false;
-	/**
-	 * Set if query is blog homepage.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_home = false;
-	/**
-	 * Set if query couldn't found anything.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_404 = false;
-	/**
-	 * Set if query is within comments popup window.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_comments_popup = false;
-	/**
-	 * Set if query is part of administration page.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_admin = false;
-	/**
-	 * Set if query is an attachment.
-	 *
-	 * @since 2.0.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_attachment = false;
-	/**
-	 * Set if is single, is a page, or is an attachment.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_singular = false;
-	/**
-	 * Set if query is for robots.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_robots = false;
-	/**
-	 * Set if query contains posts.
-	 *
-	 * Basically, the homepage if the option isn't set for the static homepage.
-	 *
-	 * @since 2.1.0
-	 * @access public
-	 * @var bool
-	 */
-	var $is_posts_page = false;
 	/**
 	 * Resets query flags to false.
 	 *
 	 * The query flags are what page info WordPress was able to figure out.
 	 * @since 2.0.0
 	 * @access private
 	 */
 	function init_query_flags() {
 		$this->is_single = false;
+		$this->is_preview = false;
 		$this->is_page = false;
 		$this->is_archive = false;
 		$this->is_date = false;
 		$this->is_year = false;
 		$this->is_month = false;
 		$this->is_feed = false;
 		$this->is_comment_feed = false;
 		$this->is_trackback = false;
 		$this->is_home = false;
 		$this->is_404 = false;
+		$this->is_comments_popup = false;
 		$this->is_paged = false;
 		$this->is_admin = false;
 		$this->is_attachment = false;
 		$this->is_singular = false;
 		$this->is_robots = false;
 		$this->is_posts_page = false;
+		$this->is_post_type_archive = false;
 	}
 	/**
 	 * Initiates object properties and sets default values.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 */
-	function init () {
+	function init() {
 		unset($this->posts);
 		unset($this->query);
 		$this->query_vars = array();
 		unset($this->queried_object);
 		unset($this->queried_object_id);
 		$this->post_count = 0;
 		$this->current_post = -1;
 		$this->in_the_loop = false;
+		unset( $this->request );
+		unset( $this->post );
+		unset( $this->comments );
+		unset( $this->comment );
+		$this->comment_count = 0;
+		$this->current_comment = -1;
+		$this->found_posts = 0;
+		$this->max_num_pages = 0;
+		$this->max_num_comment_pages = 0;
 		$this->init_query_flags();
 	}
 	/**
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 */
 	function parse_query_vars() {
-		$this->parse_query('');
+		$this->parse_query();
 	}
 	/**
 	 * Fills in the query variables, which do not exist within the parameter.
 	 *
 			, 'subpost'
 			, 'subpost_id'
 			, 'attachment'
 			, 'attachment_id'
 			, 'name'
-			, 'hour'
 			, 'static'
 			, 'pagename'
 			, 'page_id'
 			, 'second'
 			, 'minute'
 			, 'paged'
 			, 'comments_popup'
 			, 'meta_key'
 			, 'meta_value'
 			, 'preview'
+			, 's'
+			, 'sentence'
+			, 'fields'
 		);
-		foreach ($keys as $key) {
+		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]))
+			if ( !isset($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');
 		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]))
+			if ( !isset($array[$key]) )
 				$array[$key] = array();
 		}
 		return $array;
 	}
 	 * Parse a query string and set query type booleans.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 *
-	 * @param string|array $query
+	 * @param string|array $query Optional query.
 	 */
-	function parse_query ($query) {
+	function parse_query( $query =  '' ) {
-		if ( !empty($query) || !isset($this->query) ) {
+		if ( ! empty( $query ) ) {
 			$this->init();
-			if ( is_array($query) )
+			$this->query = $this->query_vars = wp_parse_args( $query );
-				$this->query_vars = $query;
+		} elseif ( ! isset( $this->query ) ) {
-			else
+			$this->query = $this->query_vars;
-				parse_str($query, $this->query_vars);
-			$this->query = $query;
 		}
 		$this->query_vars = $this->fill_query_vars($this->query_vars);
 		$qv = &$this->query_vars;
+		$this->query_vars_changed = true;
 		if ( ! empty($qv['robots']) )
 			$this->is_robots = true;
 		$qv['p'] =  absint($qv['p']);
 		$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']);
-		// Compat.  Map subpost to attachment.
+		// Compat. Map subpost to attachment.
 		if ( '' != $qv['subpost'] )
 			$qv['attachment'] = $qv['subpost'];
 		if ( '' != $qv['subpost_id'] )
 			$qv['attachment_id'] = $qv['subpost_id'];
 			// post is being queried.
 			$this->is_single = true;
 		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
 			$this->is_page = true;
 			$this->is_single = false;
-		} elseif ( !empty($qv['s']) ) {
-			$this->is_search = true;
 		} else {
-		// Look for archive queries.  Dates, categories, authors.
+		// Look for archive queries. Dates, categories, authors, search, post type archives.
+			if ( !empty($qv['s']) ) {
+				$this->is_search = true;
+			}
 			if ( '' !== $qv['second'] ) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 			if ( $qv['day'] ) {
-				if (! $this->is_date) {
+				if ( ! $this->is_date ) {
 					$this->is_day = true;
 					$this->is_date = true;
 				}
 			}
 			if ( $qv['monthnum'] ) {
-				if (! $this->is_date) {
+				if ( ! $this->is_date ) {
 					$this->is_month = true;
 					$this->is_date = true;
 				}
 			}
 			if ( $qv['year'] ) {
-				if (! $this->is_date) {
+				if ( ! $this->is_date ) {
 					$this->is_year = true;
 					$this->is_date = true;
 				}
 			}
 			if ( $qv['m'] ) {
 				$this->is_date = true;
-				if (strlen($qv['m']) > 9) {
+				if ( strlen($qv['m']) > 9 ) {
 					$this->is_time = true;
-				} else if (strlen($qv['m']) > 7) {
+				} else if ( strlen($qv['m']) > 7 ) {
 					$this->is_day = true;
-				} else if (strlen($qv['m']) > 5) {
+				} else if ( strlen($qv['m']) > 5 ) {
 					$this->is_month = true;
 				} else {
 					$this->is_year = true;
 				}
 			}
-			if ('' != $qv['w']) {
+			if ( '' != $qv['w'] ) {
 				$this->is_date = true;
 			}
-			if ( empty($qv['cat']) || ($qv['cat'] == '0') ) {
+			$this->query_vars_hash = false;
-				$this->is_category = false;
+			$this->parse_tax_query( $qv );
-			} else {
-				if (strpos($qv['cat'], '-') !== false) {
+			foreach ( $this->tax_query->queries as $tax_query ) {
-					$this->is_category = false;
+				if ( 'NOT IN' != $tax_query['operator'] ) {
-				} else {
+					switch ( $tax_query['taxonomy'] ) {
-					$this->is_category = true;
+						case 'category':
-				}
+							$this->is_category = true;
-			}
+							break;
+						case 'post_tag':
-			if ( '' != $qv['category_name'] ) {
+							$this->is_tag = true;
-				$this->is_category = true;
+							break;
-			}
+						default:
+							$this->is_tax = true;
-			if ( !is_array($qv['category__in']) || empty($qv['category__in']) ) {
-				$qv['category__in'] = array();
-			} else {
-				$qv['category__in'] = array_map('absint', $qv['category__in']);
-				$this->is_category = true;
-			}
-			if ( !is_array($qv['category__not_in']) || empty($qv['category__not_in']) ) {
-				$qv['category__not_in'] = array();
-			} else {
-				$qv['category__not_in'] = array_map('absint', $qv['category__not_in']);
-			}
-			if ( !is_array($qv['category__and']) || empty($qv['category__and']) ) {
-				$qv['category__and'] = array();
-			} else {
-				$qv['category__and'] = array_map('absint', $qv['category__and']);
-				$this->is_category = true;
-			}
-			if (  '' != $qv['tag'] )
-				$this->is_tag = true;
-			$qv['tag_id'] = absint($qv['tag_id']);
-			if (  !empty($qv['tag_id']) )
-				$this->is_tag = true;
-			if ( !is_array($qv['tag__in']) || empty($qv['tag__in']) ) {
-				$qv['tag__in'] = array();
-			} else {
-				$qv['tag__in'] = array_map('absint', $qv['tag__in']);
-				$this->is_tag = true;
-			}
-			if ( !is_array($qv['tag__not_in']) || empty($qv['tag__not_in']) ) {
-				$qv['tag__not_in'] = array();
-			} else {
-				$qv['tag__not_in'] = array_map('absint', $qv['tag__not_in']);
-			}
-			if ( !is_array($qv['tag__and']) || empty($qv['tag__and']) ) {
-				$qv['tag__and'] = array();
-			} else {
-				$qv['tag__and'] = array_map('absint', $qv['tag__and']);
-				$this->is_category = true;
-			}
-			if ( !is_array($qv['tag_slug__in']) || empty($qv['tag_slug__in']) ) {
-				$qv['tag_slug__in'] = array();
-			} else {
-				$qv['tag_slug__in'] = array_map('sanitize_title', $qv['tag_slug__in']);
-				$this->is_tag = true;
-			}
-			if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__and']) ) {
-				$qv['tag_slug__and'] = array();
-			} else {
-				$qv['tag_slug__and'] = array_map('sanitize_title', $qv['tag_slug__and']);
-				$this->is_tag = true;
-			}
-			if ( empty($qv['taxonomy']) || empty($qv['term']) ) {
-				$this->is_tax = false;
-				foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-					if ( $t->query_var && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) {
-						$qv['taxonomy'] = $taxonomy;
-						$qv['term'] = $qv[$t->query_var];
-						$this->is_tax = true;
-						break;
 					}
 				}
-			} else {
+			}
-				$this->is_tax = true;
+			unset( $tax_query );
-			}
 			if ( empty($qv['author']) || ($qv['author'] == '0') ) {
 				$this->is_author = false;
 			} else {
 				$this->is_author = true;
 			}
-			if ( '' != $qv['author_name'] ) {
+			if ( '' != $qv['author_name'] )
 				$this->is_author = true;
-			}
+			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-			if ( ($this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax) )
+				$post_type_obj = get_post_type_object( $qv['post_type'] );
+				if ( ! empty( $post_type_obj->has_archive ) )
+					$this->is_post_type_archive = true;
+			}
+			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
 				$this->is_archive = true;
 		}
 		if ( '' != $qv['feed'] )
 			$this->is_feed = true;
 		if ( '' != $qv['comments_popup'] )
 			$this->is_comments_popup = true;
 		// if we're previewing inside the write screen
-		if ('' != $qv['preview'])
+		if ( '' != $qv['preview'] )
 			$this->is_preview = true;
 		if ( is_admin() )
 			$this->is_admin = true;
 		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
 			$this->is_home = true;
 		// Correct is_* for page_on_front and page_for_posts
-		if ( $this->is_home && ( empty($this->query) || $qv['preview'] == 'true' ) && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
-			$this->is_page = true;
+			$_query = wp_parse_args($this->query);
-			$this->is_home = false;
+			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			$qv['page_id'] = get_option('page_on_front');
+			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
+				unset($_query['pagename']);
+			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+				$this->is_page = true;
+				$this->is_home = false;
+				$qv['page_id'] = get_option('page_on_front');
+				// Correct <!--nextpage--> for page_on_front
+				if ( !empty($qv['paged']) ) {
+					$qv['page'] = $qv['paged'];
+					unset($qv['paged']);
+				}
+			}
 		}
 		if ( '' != $qv['pagename'] ) {
-			$this->queried_object =& get_page_by_path($qv['pagename']);
+			$this->queried_object = get_page_by_path($qv['pagename']);
 			if ( !empty($this->queried_object) )
 				$this->queried_object_id = (int) $this->queried_object->ID;
 			else
 				unset($this->queried_object);
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
-		if ( !empty($qv['post_type']) )	{
+		if ( !empty($qv['post_type']) ) {
-			if(is_array($qv['post_type']))
+			if ( is_array($qv['post_type']) )
-				$qv['post_type'] = array_map('sanitize_user', $qv['post_type'], array(true));
+				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
 			else
-				$qv['post_type'] = sanitize_user($qv['post_type'], true);
+				$qv['post_type'] = sanitize_key($qv['post_type']);
 		}
-		if ( !empty($qv['post_status']) )
+		if ( ! empty( $qv['post_status'] ) ) {
-			$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			if ( is_array( $qv['post_status'] ) )
+				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+			else
+				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+		}
 		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
 			$this->is_comment_feed = false;
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
-		if ('404' == $qv['error'])
+		if ( '404' == $qv['error'] )
 			$this->set_404();
-		if ( !empty($query) )
+		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
-			do_action_ref_array('parse_query', array(&$this));
+		$this->query_vars_changed = false;
-	}
+		do_action_ref_array('parse_query', array(&$this));
-	/**
+	}
-	 * Sets the 404 property and saves whether query is feed.
-	 *
+	/*
-	 * @since 2.0.0
+	 * Parses various taxonomy related query vars.
-	 * @access public
+	 *
-	 */
+	 * @access protected
-	function set_404() {
+	 * @since 3.1.0
-		$is_feed = $this->is_feed;
+	 *
+	 * @param array &$q The query variables
-		$this->init_query_flags();
+	 */
-		$this->is_404 = true;
+	function parse_tax_query( &$q ) {
+		if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
-		$this->is_feed = $is_feed;
+			$tax_query = $q['tax_query'];
-	}
+		} else {
+			$tax_query = array();
-	/**
+		}
-	 * Retrieve query variable.
-	 *
+		if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
-	 * @since 1.5.0
+			$tax_query[] = array(
-	 * @access public
+				'taxonomy' => $q['taxonomy'],
-	 *
+				'terms' => array( $q['term'] ),
-	 * @param string $query_var Query variable key.
+				'field' => 'slug',
-	 * @return mixed
+			);
-	 */
+		}
-	function get($query_var) {
-		if (isset($this->query_vars[$query_var])) {
+		foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-			return $this->query_vars[$query_var];
+			if ( 'post_tag' == $taxonomy )
-		}
+				continue;	// Handled further down in the $q['tag'] block
-		return '';
+			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
-	}
+				$tax_query_defaults = array(
+					'taxonomy' => $taxonomy,
-	/**
+					'field' => 'slug',
-	 * Set query variable.
+				);
-	 *
-	 * @since 1.5.0
+				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-	 * @access public
+					$q[$t->query_var] = wp_basename( $q[$t->query_var] );
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	function set($query_var, $value) {
-		$this->query_vars[$query_var] = $value;
-	}
-	/**
-	 * Retrieve the posts based on query variables.
-	 *
-	 * There are a few filters and actions that can be used to modify the post
-	 * database query.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @uses do_action_ref_array() Calls 'pre_get_posts' hook before retrieving posts.
-	 *
-	 * @return array List of posts.
-	 */
-	function &get_posts() {
-		global $wpdb, $user_ID;
-		do_action_ref_array('pre_get_posts', array(&$this));
-		// Shorthand.
-		$q = &$this->query_vars;
-		$q = $this->fill_query_vars($q);
-		// First let's clear some variables
-		$distinct = '';
-		$whichcat = '';
-		$whichauthor = '';
-		$whichmimetype = '';
-		$where = '';
-		$limits = '';
-		$join = '';
-		$search = '';
-		$groupby = '';
-		$fields = "$wpdb->posts.*";
-		$post_status_join = false;
-		$page = 1;
-		if ( !isset($q['caller_get_posts']) )
-			$q['caller_get_posts'] = false;
-		if ( !isset($q['suppress_filters']) )
-			$q['suppress_filters'] = false;
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
-				$q['post_type'] = 'any';
-			else
-				$q['post_type'] = '';
-		}
-		$post_type = $q['post_type'];
-		if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
-			$q['posts_per_page'] = get_option('posts_per_page');
-		if ( isset($q['showposts']) && $q['showposts'] ) {
-			$q['showposts'] = (int) $q['showposts'];
-			$q['posts_per_page'] = $q['showposts'];
-		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
-			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
-			if ($q['posts_per_page'] == -1) {
-				$q['nopaging'] = true;
-			} else {
-				$q['nopaging'] = false;
-			}
-		}
-		if ( $this->is_feed ) {
-			$q['posts_per_page'] = get_option('posts_per_rss');
-			$q['nopaging'] = false;
-		}
-		$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 )
-			$q['posts_per_page'] = 1;
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
-			$q['comments_per_page'] = get_option('comments_per_page');
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
-			$this->is_page = true;
-			$this->is_home = false;
-			$q['page_id'] = get_option('page_on_front');
-		}
-		if (isset($q['page'])) {
-			$q['page'] = trim($q['page'], '/');
-			$q['page'] = absint($q['page']);
-		}
-		// If a month is specified in the querystring, load that month
-		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);
-			if (strlen($q['m'])>7)
-				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
-			if (strlen($q['m'])>9)
-				$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
-			if (strlen($q['m'])>11)
-				$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
-			if (strlen($q['m'])>13)
-				$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
-		}
-		if ( '' !== $q['hour'] )
-			$where .= " AND HOUR($wpdb->posts.post_date)='" . $q['hour'] . "'";
-		if ( '' !== $q['minute'] )
-			$where .= " AND MINUTE($wpdb->posts.post_date)='" . $q['minute'] . "'";
-		if ( '' !== $q['second'] )
-			$where .= " AND SECOND($wpdb->posts.post_date)='" . $q['second'] . "'";
-		if ( $q['year'] )
-			$where .= " AND YEAR($wpdb->posts.post_date)='" . $q['year'] . "'";
-		if ( $q['monthnum'] )
-			$where .= " AND MONTH($wpdb->posts.post_date)='" . $q['monthnum'] . "'";
-		if ( $q['day'] )
-			$where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
-		if ('' != $q['name']) {
-			$q['name'] = sanitize_title($q['name']);
-			$where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
-		} else if ('' != $q['pagename']) {
-			if ( isset($this->queried_object_id) )
-				$reqpage = $this->queried_object_id;
-			else {
-				$reqpage = get_page_by_path($q['pagename']);
-				if ( !empty($reqpage) )
-					$reqpage = $reqpage->ID;
-				else
-					$reqpage = 0;
-			}
-			$page_for_posts = get_option('page_for_posts');
-			if  ( ('page' != get_option('show_on_front') ) ||  empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-				$q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
-				$page_paths = '/' . trim($q['pagename'], '/');
-				$q['pagename'] = sanitize_title(basename($page_paths));
-				$q['name'] = $q['pagename'];
-				$where .= " AND ($wpdb->posts.ID = '$reqpage')";
-				$reqpage_obj = get_page($reqpage);
-				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
-					$this->is_attachment = true;
-					$this->is_page = true;
-					$q['attachment_id'] = $reqpage;
 				}
-			}
-		} elseif ('' != $q['attachment']) {
+				$term = $q[$t->query_var];
-			$q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
-			$attach_paths = '/' . trim($q['attachment'], '/');
+				if ( strpos($term, '+') !== false ) {
-			$q['attachment'] = sanitize_title(basename($attach_paths));
+					$terms = preg_split( '/[+]+/', $term );
-			$q['name'] = $q['attachment'];
+					foreach ( $terms as $term ) {
-			$where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
+						$tax_query[] = array_merge( $tax_query_defaults, array(
-		}
+							'terms' => array( $term )
+						) );
-		if ( $q['w'] )
+					}
-			$where .= " AND WEEK($wpdb->posts.post_date, 1)='" . $q['w'] . "'";
+				} else {
+					$tax_query[] = array_merge( $tax_query_defaults, array(
-		if ( intval($q['comments_popup']) )
+						'terms' => preg_split( '/[,]+/', $term )
-			$q['p'] = absint($q['comments_popup']);
+					) );
+				}
-		// If an attachment is requested by number, let it supercede any post number.
-		if ( $q['attachment_id'] )
-			$q['p'] = absint($q['attachment_id']);
-		// If a post number is specified, load that post
-		if ( $q['p'] ) {
-			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
-		} elseif ( $q['post__in'] ) {
-			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
-			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
-		} elseif ( $q['post__not_in'] ) {
-			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
-			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
-		}
-		if ( is_numeric($q['post_parent']) )
-			$where .= $wpdb->prepare( " AND $wpdb->posts.post_parent = %d ", $q['post_parent'] );
-		if ( $q['page_id'] ) {
-			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
-				$q['p'] = $q['page_id'];
-				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
-			}
-		}
-		// 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('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $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 = addslashes_gpc($term);
-				$search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
-				$searchand = ' AND ';
-			}
-			$term = esc_sql($q['s']);
-			if (empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
-				$search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";
-			if ( !empty($search) ) {
-				$search = " AND ({$search}) ";
-				if ( !is_user_logged_in() )
-					$search .= " AND ($wpdb->posts.post_password = '') ";
 			}
 		}
 		// Category stuff
+		if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
-		if ( empty($q['cat']) || ($q['cat'] == '0') ||
-				// Bypass cat checks if fetching specific posts
-				$this->is_singular ) {
-			$whichcat = '';
-		} else {
 			$q['cat'] = ''.urldecode($q['cat']).'';
 			$q['cat'] = addslashes_gpc($q['cat']);
 			$cat_array = preg_split('/[,\s]+/', $q['cat']);
 			$q['cat'] = '';
 			$req_cats = array();
 				$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'));
+					$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'));
+					$q['category__not_in'] = array_merge( $q['category__not_in'], get_term_children($cat, 'category') );
 				}
 			}
 			$q['cat'] = implode(',', $req_cats);
 		}
 		if ( !empty($q['category__in']) ) {
-			$join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
+			$q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
-			$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
+			$tax_query[] = array(
-			$include_cats = "'" . implode("', '", $q['category__in']) . "'";
+				'taxonomy' => 'category',
-			$whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_cats) ";
+				'terms' => $q['category__in'],
+				'field' => 'term_id',
+				'include_children' => false
+			);
 		}
 		if ( !empty($q['category__not_in']) ) {
-			$cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
+			$q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
-			$whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
+			$tax_query[] = array(
-		}
+				'taxonomy' => 'category',
+				'terms' => $q['category__not_in'],
-		// Category stuff for nice URLs
+				'operator' => 'NOT IN',
-		if ( '' != $q['category_name'] && !$this->is_singular ) {
+				'include_children' => false
-			$q['category_name'] = implode('/', array_map('sanitize_title', explode('/', $q['category_name'])));
+			);
-			$reqcat = get_category_by_path($q['category_name']);
+		}
-			$q['category_name'] = str_replace('%2F', '/', urlencode(urldecode($q['category_name'])));
-			$cat_paths = '/' . trim($q['category_name'], '/');
+		if ( !empty($q['category__and']) ) {
-			$q['category_name'] = sanitize_title(basename($cat_paths));
+			$q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
+			$tax_query[] = array(
-			$cat_paths = '/' . trim(urldecode($q['category_name']), '/');
+				'taxonomy' => 'category',
-			$q['category_name'] = sanitize_title(basename($cat_paths));
+				'terms' => $q['category__and'],
-			$cat_paths = explode('/', $cat_paths);
+				'field' => 'term_id',
-			$cat_path = '';
+				'operator' => 'AND',
-			foreach ( (array) $cat_paths as $pathdir )
+				'include_children' => false
-				$cat_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
+			);
+		}
-			//if we don't match the entire hierarchy fallback on just matching the nicename
-			if ( empty($reqcat) )
+		// Tag stuff
-				$reqcat = get_category_by_path($q['category_name'], false);
+		if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
-			if ( !empty($reqcat) )
-				$reqcat = $reqcat->term_id;
-			else
-				$reqcat = 0;
-			$q['cat'] = $reqcat;
-			$join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
-			$whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
-			$in_cats = array($q['cat']);
-			$in_cats = array_merge($in_cats, get_term_children($q['cat'], 'category'));
-			$in_cats = "'" . implode("', '", $in_cats) . "'";
-			$whichcat .= "AND $wpdb->term_taxonomy.term_id IN ($in_cats)";
-			$groupby = "{$wpdb->posts}.ID";
-		}
-		// Tags
-		if ( '' != $q['tag'] ) {
 			if ( strpos($q['tag'], ',') !== false ) {
 				$tags = preg_split('/[,\s]+/', $q['tag']);
 				foreach ( (array) $tags as $tag ) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__in'][] = $tag;
 				$q['tag'] = sanitize_term_field('slug', $q['tag'], 0, 'post_tag', 'db');
 				$q['tag_slug__in'][] = $q['tag'];
 			}
 		}
-		if ( !empty($q['category__in']) || !empty($q['meta_key']) || !empty($q['tag__in']) || !empty($q['tag_slug__in']) ) {
+		if ( !empty($q['tag_id']) ) {
-			$groupby = "{$wpdb->posts}.ID";
+			$q['tag_id'] = absint( $q['tag_id'] );
-		}
+			$tax_query[] = array(
+				'taxonomy' => 'post_tag',
-		if ( !empty($q['tag__in']) && empty($q['cat']) ) {
+				'terms' => $q['tag_id']
-			$join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
+			);
-			$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
+		}
-			$include_tags = "'" . implode("', '", $q['tag__in']) . "'";
-			$whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) ";
+		if ( !empty($q['tag__in']) ) {
-			$reqtag = is_term( $q['tag__in'][0], 'post_tag' );
+			$q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
-			if ( !empty($reqtag) )
+			$tax_query[] = array(
-				$q['tag_id'] = $reqtag['term_id'];
+				'taxonomy' => 'post_tag',
-		}
+				'terms' => $q['tag__in']
+			);
-		if ( !empty($q['tag_slug__in']) && empty($q['cat']) ) {
-			$join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) INNER JOIN $wpdb->terms ON ($wpdb->term_taxonomy.term_id = $wpdb->terms.term_id) ";
-			$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
-			$include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
-			$whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
-			$reqtag = get_term_by( 'slug', $q['tag_slug__in'][0], 'post_tag' );
-			if ( !empty($reqtag) )
-				$q['tag_id'] = $reqtag->term_id;
 		}
 		if ( !empty($q['tag__not_in']) ) {
-			$tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
+			$q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
-			$whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
+			$tax_query[] = array(
-		}
+				'taxonomy' => 'post_tag',
+				'terms' => $q['tag__not_in'],
-		// Tag and slug intersections.
+				'operator' => 'NOT IN'
-		$intersections = array('category__and' => 'category', 'tag__and' => 'post_tag', 'tag_slug__and' => 'post_tag', 'tag__in' => 'post_tag', 'tag_slug__in' => 'post_tag');
+			);
-		$tagin = array('tag__in', 'tag_slug__in'); // These are used to make some exceptions below
+		}
-		foreach ($intersections as $item => $taxonomy) {
-			if ( empty($q[$item]) ) continue;
+		if ( !empty($q['tag__and']) ) {
-			if ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used
+			$q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
+			$tax_query[] = array(
-			if ( $item != 'category__and' ) {
+				'taxonomy' => 'post_tag',
-				$reqtag = is_term( $q[$item][0], 'post_tag' );
+				'terms' => $q['tag__and'],
-				if ( !empty($reqtag) )
+				'operator' => 'AND'
-					$q['tag_id'] = $reqtag['term_id'];
+			);
-			}
+		}
-			if ( in_array( $item, array('tag_slug__and', 'tag_slug__in' ) ) )
+		if ( !empty($q['tag_slug__in']) ) {
-				$taxonomy_field = 'slug';
+			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
+			$tax_query[] = array(
+				'taxonomy' => 'post_tag',
+				'terms' => $q['tag_slug__in'],
+				'field' => 'slug'
+			);
+		}
+		if ( !empty($q['tag_slug__and']) ) {
+			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
+			$tax_query[] = array(
+				'taxonomy' => 'post_tag',
+				'terms' => $q['tag_slug__and'],
+				'field' => 'slug',
+				'operator' => 'AND'
+			);
+		}
+		$this->tax_query = new WP_Tax_Query( $tax_query );
+	}
+	/**
+	 * Sets the 404 property and saves whether query is feed.
+	 *
+	 * @since 2.0.0
+	 * @access public
+	 */
+	function set_404() {
+		$is_feed = $this->is_feed;
+		$this->init_query_flags();
+		$this->is_404 = true;
+		$this->is_feed = $is_feed;
+	}
+	/**
+	 * Retrieve query variable.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 *
+	 * @param string $query_var Query variable key.
+	 * @return mixed
+	 */
+	function get($query_var) {
+		if ( isset($this->query_vars[$query_var]) )
+			return $this->query_vars[$query_var];
+		return '';
+	}
+	/**
+	 * Set query variable.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 *
+	 * @param string $query_var Query variable key.
+	 * @param mixed $value Query variable value.
+	 */
+	function set($query_var, $value) {
+		$this->query_vars[$query_var] = $value;
+	}
+	/**
+	 * Retrieve the posts based on query variables.
+	 *
+	 * There are a few filters and actions that can be used to modify the post
+	 * database query.
+	 *
+	 * @since 1.5.0
+	 * @access public
+	 * @uses do_action_ref_array() Calls 'pre_get_posts' hook before retrieving posts.
+	 *
+	 * @return array List of posts.
+	 */
+	function &get_posts() {
+		global $wpdb, $user_ID, $_wp_using_ext_object_cache;
+		$this->parse_query();
+		do_action_ref_array('pre_get_posts', array(&$this));
+		// Shorthand.
+		$q = &$this->query_vars;
+		// Fill again in case pre_get_posts unset some vars.
+		$q = $this->fill_query_vars($q);
+		// Parse meta query
+		$this->meta_query = new WP_Meta_Query();
+		$this->meta_query->parse_query_vars( $q );
+		// Set a flag if a pre_get_posts hook changed the query vars.
+		$hash = md5( serialize( $this->query_vars ) );
+		if ( $hash != $this->query_vars_hash ) {
+			$this->query_vars_changed = true;
+			$this->query_vars_hash = $hash;
+		}
+		unset($hash);
+		// First let's clear some variables
+		$distinct = '';
+		$whichauthor = '';
+		$whichmimetype = '';
+		$where = '';
+		$limits = '';
+		$join = '';
+		$search = '';
+		$groupby = '';
+		$fields = '';
+		$post_status_join = false;
+		$page = 1;
+		if ( isset( $q['caller_get_posts'] ) ) {
+			_deprecated_argument( 'WP_Query', '3.1', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
+			if ( !isset( $q['ignore_sticky_posts'] ) )
+				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
+		}
+		if ( !isset( $q['ignore_sticky_posts'] ) )
+			$q['ignore_sticky_posts'] = false;
+		if ( !isset($q['suppress_filters']) )
+			$q['suppress_filters'] = false;
+		if ( !isset($q['cache_results']) ) {
+			if ( $_wp_using_ext_object_cache )
+				$q['cache_results'] = false;
 			else
-				$taxonomy_field = 'term_id';
+				$q['cache_results'] = true;
+		}
-			$q[$item] = array_unique($q[$item]);
-			$tsql = "SELECT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->term_relationships tr ON (p.ID = tr.object_id) INNER JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) INNER JOIN $wpdb->terms t ON (tt.term_id = t.term_id)";
+		if ( !isset($q['update_post_term_cache']) )
-			$tsql .= " WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
+			$q['update_post_term_cache'] = true;
-			if ( !in_array($item, $tagin) ) { // This next line is only helpful if we are doing an and relationship
-				$tsql .= " GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
+		if ( !isset($q['update_post_meta_cache']) )
-			}
+			$q['update_post_meta_cache'] = true;
-			$post_ids = $wpdb->get_col($tsql);
+		if ( !isset($q['post_type']) ) {
-			if ( count($post_ids) )
+			if ( $this->is_search )
-				$whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
+				$q['post_type'] = 'any';
-			else {
+			else
-				$whichcat = " AND 0 = 1";
+				$q['post_type'] = '';
+		}
+		$post_type = $q['post_type'];
+		if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
+			$q['posts_per_page'] = get_option('posts_per_page');
+		if ( isset($q['showposts']) && $q['showposts'] ) {
+			$q['showposts'] = (int) $q['showposts'];
+			$q['posts_per_page'] = $q['showposts'];
+		}
+		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+			$q['posts_per_page'] = $q['posts_per_archive_page'];
+		if ( !isset($q['nopaging']) ) {
+			if ( $q['posts_per_page'] == -1 ) {
+				$q['nopaging'] = true;
+			} else {
+				$q['nopaging'] = false;
+			}
+		}
+		if ( $this->is_feed ) {
+			$q['posts_per_page'] = get_option('posts_per_rss');
+			$q['nopaging'] = false;
+		}
+		$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 )
+			$q['posts_per_page'] = 1;
+		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
+			$q['comments_per_page'] = get_option('comments_per_page');
+		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+			$this->is_page = true;
+			$this->is_home = false;
+			$q['page_id'] = get_option('page_on_front');
+		}
+		if ( isset($q['page']) ) {
+			$q['page'] = trim($q['page'], '/');
+			$q['page'] = absint($q['page']);
+		}
+		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
+		if ( isset($q['no_found_rows']) )
+			$q['no_found_rows'] = (bool) $q['no_found_rows'];
+		else
+			$q['no_found_rows'] = false;
+		switch ( $q['fields'] ) {
+			case 'ids':
+				$fields = "$wpdb->posts.ID";
 				break;
-			}
+			case 'id=>parent':
-		}
+				$fields = "$wpdb->posts.ID, $wpdb->posts.post_parent";
+				break;
-		// Taxonomies
+			default:
-		if ( $this->is_tax ) {
+				$fields = "$wpdb->posts.*";
-			if ( '' != $q['taxonomy'] ) {
+		}
-				$taxonomy = $q['taxonomy'];
-				$tt[$taxonomy] = $q['term'];
+		// If a month is specified in the querystring, load that month
-				$terms = get_terms($q['taxonomy'], array('slug'=>$q['term']));
+		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);
+			if ( strlen($q['m']) > 7 )
+				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
+			if ( strlen($q['m']) > 9 )
+				$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
+			if ( strlen($q['m']) > 11 )
+				$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
+			if ( strlen($q['m']) > 13 )
+				$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
+		}
+		if ( '' !== $q['hour'] )
+			$where .= " AND HOUR($wpdb->posts.post_date)='" . $q['hour'] . "'";
+		if ( '' !== $q['minute'] )
+			$where .= " AND MINUTE($wpdb->posts.post_date)='" . $q['minute'] . "'";
+		if ( '' !== $q['second'] )
+			$where .= " AND SECOND($wpdb->posts.post_date)='" . $q['second'] . "'";
+		if ( $q['year'] )
+			$where .= " AND YEAR($wpdb->posts.post_date)='" . $q['year'] . "'";
+		if ( $q['monthnum'] )
+			$where .= " AND MONTH($wpdb->posts.post_date)='" . $q['monthnum'] . "'";
+		if ( $q['day'] )
+			$where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
+		// If we've got a post_type AND its not "any" post_type.
+		if ( !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 ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+					continue;
+				if ( ! $ptype_obj->hierarchical || strpos($q[ $ptype_obj->query_var ], '/') === false ) {
+					// Non-hierarchical post_types & parent-level-hierarchical post_types can directly use 'name'
+					$q['name'] = $q[ $ptype_obj->query_var ];
+				} else {
+					// Hierarchical post_types will operate through the
+					$q['pagename'] = $q[ $ptype_obj->query_var ];
+					$q['name'] = '';
+				}
+				// Only one request for a slug is possible, this is why name & pagename are overwritten above.
+				break;
+			} //end foreach
+			unset($ptype_obj);
+		}
+		if ( '' != $q['name'] ) {
+			$q['name'] = sanitize_title_for_query( $q['name'] );
+			$where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
+		} elseif ( '' != $q['pagename'] ) {
+			if ( isset($this->queried_object_id) ) {
+				$reqpage = $this->queried_object_id;
 			} else {
-				foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+				if ( 'page' != $q['post_type'] ) {
-					if ( $t->query_var && '' != $q[$t->query_var] ) {
+					foreach ( (array)$q['post_type'] as $_post_type ) {
-						$terms = get_terms($taxonomy, array('slug'=>$q[$t->query_var]));
+						$ptype_obj = get_post_type_object($_post_type);
-						if ( !is_wp_error($terms) )
+						if ( !$ptype_obj || !$ptype_obj->hierarchical )
+							continue;
+						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
+						if ( $reqpage )
 							break;
 					}
+					unset($ptype_obj);
+				} else {
+					$reqpage = get_page_by_path($q['pagename']);
 				}
-			}
+				if ( !empty($reqpage) )
-			if ( is_wp_error($terms) || empty($terms) ) {
+					$reqpage = $reqpage->ID;
-				$whichcat = " AND 0 ";
+				else
+					$reqpage = 0;
+			}
+			$page_for_posts = get_option('page_for_posts');
+			if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
+				$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);
+				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+					$this->is_attachment = true;
+					$post_type = $q['post_type'] = 'attachment';
+					$this->is_page = true;
+					$q['attachment_id'] = $reqpage;
+				}
+			}
+		} elseif ( '' != $q['attachment'] ) {
+			$q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
+			$q['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 an attachment is requested by number, let it supersede any post number.
+		if ( $q['attachment_id'] )
+			$q['p'] = absint($q['attachment_id']);
+		// If a post number is specified, load that post
+		if ( $q['p'] ) {
+			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
+		} elseif ( $q['post__in'] ) {
+			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
+			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
+		} elseif ( $q['post__not_in'] ) {
+			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
+			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
+		}
+		if ( is_numeric($q['post_parent']) )
+			$where .= $wpdb->prepare( " AND $wpdb->posts.post_parent = %d ", $q['post_parent'] );
+		if ( $q['page_id'] ) {
+			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
+				$q['p'] = $q['page_id'];
+				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
+			}
+		}
+		// 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 {
-				foreach ( $terms as $term )
+				preg_match_all('/".*?("|$)|((?<=[\r\n\t ",+])|^)[^\r\n\t ",+]+/', $q['s'], $matches);
-					$term_ids[] = $term->term_id;
+				$q['search_terms'] = array_map('_search_terms_tidy', $matches[0]);
-				$post_ids = get_objects_in_term($term_ids, $taxonomy);
+			}
-				if ( !is_wp_error($post_ids) && count($post_ids) ) {
+			$n = !empty($q['exact']) ? '' : '%';
-					$whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
+			$searchand = '';
-					$post_type = 'any';
+			foreach( (array) $q['search_terms'] as $term ) {
-					$q['post_status'] = 'publish';
+				$term = esc_sql( like_escape( $term ) );
-					$post_status_join = true;
+				$search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
-				} else {
+				$searchand = ' AND ';
-					$whichcat = " AND 0 ";
+			}
+			if ( !empty($search) ) {
+				$search = " AND ({$search}) ";
+				if ( !is_user_logged_in() )
+					$search .= " AND ($wpdb->posts.post_password = '') ";
+			}
+		}
+		// Allow plugins to contextually add/remove/modify the search section of the database query
+		$search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
+		// Taxonomies
+		if ( !$this->is_singular ) {
+			$this->parse_tax_query( $q );
+			$clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+			$join .= $clauses['join'];
+			$where .= $clauses['where'];
+		}
+		if ( $this->is_tax ) {
+			if ( empty($post_type) ) {
+				$post_type = 'any';
+				$post_status_join = true;
+			} elseif ( in_array('attachment', (array) $post_type) ) {
+				$post_status_join = true;
+			}
+		}
+		// Back-compat
+		if ( !empty($this->tax_query->queries) ) {
+			$tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
+			if ( !empty( $tax_query_in_and ) ) {
+				if ( !isset( $q['taxonomy'] ) ) {
+					foreach ( $tax_query_in_and as $a_tax_query ) {
+						if ( !in_array( $a_tax_query['taxonomy'], array( 'category', 'post_tag' ) ) ) {
+							$q['taxonomy'] = $a_tax_query['taxonomy'];
+							if ( 'slug' == $a_tax_query['field'] )
+								$q['term'] = $a_tax_query['terms'][0];
+							else
+								$q['term_id'] = $a_tax_query['terms'][0];
+							break;
+						}
+					}
 				}
-			}
+				$cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) );
+				if ( !empty( $cat_query ) ) {
+					$cat_query = reset( $cat_query );
+					$the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
+					if ( $the_cat ) {
+						$this->set( 'cat', $the_cat->term_id );
+						$this->set( 'category_name', $the_cat->slug );
+					}
+					unset( $the_cat );
+				}
+				unset( $cat_query );
+				$tag_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'post_tag' ) );
+				if ( !empty( $tag_query ) ) {
+					$tag_query = reset( $tag_query );
+					$the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
+					if ( $the_tag ) {
+						$this->set( 'tag_id', $the_tag->term_id );
+					}
+					unset( $the_tag );
+				}
+				unset( $tag_query );
+			}
+		}
+		if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+			$groupby = "{$wpdb->posts}.ID";
 		}
 		// Author/user stuff
 		if ( empty($q['author']) || ($q['author'] == '0') ) {
-			$whichauthor='';
+			$whichauthor = '';
 		} else {
-			$q['author'] = ''.urldecode($q['author']).'';
+			$q['author'] = (string)urldecode($q['author']);
 			$q['author'] = addslashes_gpc($q['author']);
-			if (strpos($q['author'], '-') !== false) {
+			if ( strpos($q['author'], '-') !== false ) {
 				$eq = '!=';
 				$andor = 'AND';
 				$q['author'] = explode('-', $q['author']);
-				$q['author'] = '' . absint($q['author'][1]);
+				$q['author'] = (string)absint($q['author'][1]);
 			} else {
 				$eq = '=';
 				$andor = 'OR';
 			}
 			$author_array = preg_split('/[,\s]+/', $q['author']);
-			$whichauthor .= " AND ($wpdb->posts.post_author ".$eq.' '.absint($author_array[0]);
+			$_author_array = array();
-			for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
+			foreach ( $author_array as $key => $_author )
-				$whichauthor .= ' '.$andor." $wpdb->posts.post_author ".$eq.' '.absint($author_array[$i]);
+				$_author_array[] = "$wpdb->posts.post_author " . $eq . ' ' . absint($_author);
-			}
+			$whichauthor .= ' AND (' . implode(" $andor ", $_author_array) . ')';
-			$whichauthor .= ')';
+			unset($author_array, $_author_array);
 		}
 		// Author stuff for nice URLs
-		if ('' != $q['author_name']) {
+		if ( '' != $q['author_name'] ) {
-			if (strpos($q['author_name'], '/') !== false) {
+			if ( strpos($q['author_name'], '/') !== false ) {
-				$q['author_name'] = explode('/',$q['author_name']);
+				$q['author_name'] = explode('/', $q['author_name']);
-				if ($q['author_name'][count($q['author_name'])-1]) {
+				if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-1];#no trailing slash
+					$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
 				} else {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-2];#there was a trailling slash
+					$q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
 				}
 			}
-			$q['author_name'] = sanitize_title($q['author_name']);
+			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
-			$q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
 			$q['author'] = get_user_by('slug', $q['author_name']);
 			if ( $q['author'] )
 				$q['author'] = $q['author']->ID;
-			$whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')';
+			$whichauthor .= " AND ($wpdb->posts.post_author = " . absint($q['author']) . ')';
 		}
 		// MIME-Type stuff for attachment browsing
-		if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] )
+		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] )
-			$whichmimetype = wp_post_mime_type_where($q['post_mime_type']);
+			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
-		$where .= $search.$whichcat.$whichauthor.$whichmimetype;
+		$where .= $search . $whichauthor . $whichmimetype;
 		if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) )
 			$q['order'] = 'DESC';
 		// Order by
 		if ( empty($q['orderby']) ) {
-			$q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
+			$orderby = "$wpdb->posts.post_date " . $q['order'];
 		} elseif ( 'none' == $q['orderby'] ) {
-			$q['orderby'] = '';
+			$orderby = '';
 		} else {
 			// Used to filter values
-			$allowed_keys = array('author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
+			$allowed_keys = array('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
 			if ( !empty($q['meta_key']) ) {
 				$allowed_keys[] = $q['meta_key'];
 				$allowed_keys[] = 'meta_value';
+				$allowed_keys[] = 'meta_value_num';
 			}
 			$q['orderby'] = urldecode($q['orderby']);
 			$q['orderby'] = addslashes_gpc($q['orderby']);
-			$orderby_array = explode(' ',$q['orderby']);
-			if ( empty($orderby_array) )
+			$orderby_array = array();
-				$orderby_array[] = $q['orderby'];
+			foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
-			$q['orderby'] = '';
-			for ($i = 0; $i < count($orderby_array); $i++) {
 				// Only allow certain values for safety
-				$orderby = $orderby_array[$i];
+				if ( ! in_array($orderby, $allowed_keys) )
-				switch ($orderby) {
+					continue;
+				switch ( $orderby ) {
 					case 'menu_order':
+						$orderby = "$wpdb->posts.menu_order";
 						break;
 					case 'ID':
 						$orderby = "$wpdb->posts.ID";
 						break;
 					case 'rand':
 						break;
 					case $q['meta_key']:
 					case 'meta_value':
 						$orderby = "$wpdb->postmeta.meta_value";
 						break;
+					case 'meta_value_num':
+						$orderby = "$wpdb->postmeta.meta_value+0";
+						break;
 					case 'comment_count':
 						$orderby = "$wpdb->posts.comment_count";
 						break;
 					default:
 						$orderby = "$wpdb->posts.post_" . $orderby;
 				}
-				if ( in_array($orderby_array[$i], $allowed_keys) )
-					$q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
+				$orderby_array[] = $orderby;
 			}
-			// append ASC or DESC at the end
+			$orderby = implode( ',', $orderby_array );
-			if ( !empty($q['orderby']))
-				$q['orderby'] .= " {$q['order']}";
+			if ( empty( $orderby ) )
+				$orderby = "$wpdb->posts.post_date ".$q['order'];
-			if ( empty($q['orderby']) )
+			else
-				$q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
+				$orderby .= " {$q['order']}";
 		}
-		if ( is_array($post_type) )
+		if ( is_array( $post_type ) ) {
 			$post_type_cap = 'multiple_post_type';
-		else
+		} else {
-			$post_type_cap = $post_type;
+			$post_type_object = get_post_type_object( $post_type );
+			if ( empty( $post_type_object ) )
-		$exclude_post_types = '';
+				$post_type_cap = $post_type;
-		foreach ( get_post_types( array('exclude_from_search' => true) ) as $_wp_post_type )
+		}
-			$exclude_post_types .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $_wp_post_type);
 		if ( 'any' == $post_type ) {
-			$where .= $exclude_post_types;
+			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
+			if ( ! empty( $in_search_post_types ) )
+				$where .= $wpdb->prepare(" 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 ) ) {
 			$where .= " AND $wpdb->posts.post_type = '$post_type'";
+			$post_type_object = get_post_type_object ( $post_type );
 		} elseif ( $this->is_attachment ) {
 			$where .= " AND $wpdb->posts.post_type = 'attachment'";
-			$post_type_cap = 'post';
+			$post_type_object = get_post_type_object ( 'attachment' );
-		} elseif ($this->is_page) {
+		} elseif ( $this->is_page ) {
 			$where .= " AND $wpdb->posts.post_type = 'page'";
-			$post_type_cap = 'page';
+			$post_type_object = get_post_type_object ( 'page' );
 		} else {
 			$where .= " AND $wpdb->posts.post_type = 'post'";
-			$post_type_cap = 'post';
+			$post_type_object = get_post_type_object ( 'post' );
 		}
-		if ( isset($q['post_status']) && '' != $q['post_status'] ) {
+		if ( ! empty( $post_type_object ) ) {
+			$edit_cap = $post_type_object->cap->edit_post;
+			$read_cap = $post_type_object->cap->read_post;
+			$edit_others_cap = $post_type_object->cap->edit_others_posts;
+			$read_private_cap = $post_type_object->cap->read_private_posts;
+		} else {
+			$edit_cap = 'edit_' . $post_type_cap;
+			$read_cap = 'read_' . $post_type_cap;
+			$edit_others_cap = 'edit_others_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+		}
+		if ( ! empty( $q['post_status'] ) ) {
 			$statuswheres = array();
-			$q_status = explode(',', $q['post_status']);
+			$q_status = $q['post_status'];
+			if ( ! is_array( $q_status ) )
+				$q_status = explode(',', $q_status);
 			$r_status = array();
 			$p_status = array();
-			if ( $q['post_status'] == 'any' ) {
+			$e_status = array();
-				// @todo Use register_post_status() data to determine which states should be excluded.
+			if ( in_array('any', $q_status) ) {
-				$r_status[] = "$wpdb->posts.post_status <> 'trash'";
+				foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
+					$e_status[] = "$wpdb->posts.post_status <> '$status'";
 			} else {
-				if ( in_array( 'draft'  , $q_status ) )
+				foreach ( get_post_stati() as $status ) {
-					$r_status[] = "$wpdb->posts.post_status = 'draft'";
+					if ( in_array( $status, $q_status ) ) {
-				if ( in_array( 'pending', $q_status ) )
+						if ( 'private' == $status )
-					$r_status[] = "$wpdb->posts.post_status = 'pending'";
+							$p_status[] = "$wpdb->posts.post_status = '$status'";
-				if ( in_array( 'future' , $q_status ) )
+						else
-					$r_status[] = "$wpdb->posts.post_status = 'future'";
+							$r_status[] = "$wpdb->posts.post_status = '$status'";
-				if ( in_array( 'inherit' , $q_status ) )
+					}
-					$r_status[] = "$wpdb->posts.post_status = 'inherit'";
+				}
-				if ( in_array( 'private', $q_status ) )
-					$p_status[] = "$wpdb->posts.post_status = 'private'";
-				if ( in_array( 'publish', $q_status ) )
-					$r_status[] = "$wpdb->posts.post_status = 'publish'";
-				if ( in_array( 'trash', $q_status ) )
-					$r_status[] = "$wpdb->posts.post_status = 'trash'";
 			}
 			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
 				$r_status = array_merge($r_status, $p_status);
 				unset($p_status);
 			}
+			if ( !empty($e_status) ) {
+				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			}
 			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type_cap}s") )
+				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_{$post_type_cap}s") )
+				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 ) . ")";
 			}
 			if ( $post_status_join ) {
 				$join .= " LEFT JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
 			foreach ( $statuswheres as $statuswhere )
 				$where .= " AND $statuswhere";
 		} elseif ( !$this->is_singular ) {
 			$where .= " AND ($wpdb->posts.post_status = 'publish'";
-			if ( is_admin() )
+			// Add public states.
-				$where .= " OR $wpdb->posts.post_status = 'future' OR $wpdb->posts.post_status = 'draft' OR $wpdb->posts.post_status = 'pending'";
+			$public_states = get_post_stati( array('public' => true) );
+			foreach ( (array) $public_states as $state ) {
+				if ( 'publish' == $state ) // Publish is hard-coded above.
+					continue;
+				$where .= " OR $wpdb->posts.post_status = '$state'";
+			}
+			if ( $this->is_admin ) {
+				// Add protected states that should show in the admin all list.
+				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
+				foreach ( (array) $admin_all_states as $state )
+					$where .= " OR $wpdb->posts.post_status = '$state'";
+			}
 			if ( is_user_logged_in() ) {
-				$where .= current_user_can( "read_private_{$post_type_cap}s" ) ? " OR $wpdb->posts.post_status = 'private'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.post_status = 'private'";
+				// 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 .= ')';
 		}
-		// postmeta queries
+		if ( !empty( $this->meta_query->queries ) ) {
-		if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) )
+			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
-			$join .= " JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
+			$join .= $clauses['join'];
-		if ( ! empty($q['meta_key']) )
+			$where .= $clauses['where'];
-			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
-		if ( ! empty($q['meta_value']) ) {
-			if ( ! isset($q['meta_compare']) || empty($q['meta_compare']) || ! in_array($q['meta_compare'], array('=', '!=', '>', '>=', '<', '<=')) )
-				$q['meta_compare'] = '=';
-			$where .= $wpdb->prepare("AND $wpdb->postmeta.meta_value {$q['meta_compare']} %s ", $q['meta_value']);
 		}
 		// Apply filters on where and join prior to paging so that any
 		// manipulations to them are reflected in the paging by day queries.
 		if ( !$q['suppress_filters'] ) {
-			$where = apply_filters('posts_where', $where);
+			$where = apply_filters_ref_array('posts_where', array( $where, &$this ) );
-			$join = apply_filters('posts_join', $join);
+			$join = apply_filters_ref_array('posts_join', array( $join, &$this ) );
 		}
 		// Paging
 		if ( empty($q['nopaging']) && !$this->is_singular ) {
 			$page = absint($q['paged']);
-			if (empty($page)) {
+			if ( !$page )
 				$page = 1;
-			}
 			if ( empty($q['offset']) ) {
-				$pgstrt = '';
 				$pgstrt = ($page - 1) * $q['posts_per_page'] . ', ';
-				$limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
 			} else { // we're ignoring $page and using 'offset'
 				$q['offset'] = absint($q['offset']);
 				$pgstrt = $q['offset'] . ', ';
-				$limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+			}
-			}
+			$limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
 		}
 		// Comments feeds
 		if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
 			if ( $this->is_archive || $this->is_search ) {
 				$cwhere = "WHERE post_status = 'publish' AND comment_approved = '1'";
 				$cgroupby = '';
 			}
 			if ( !$q['suppress_filters'] ) {
-				$cjoin = apply_filters('comment_feed_join', $cjoin);
+				$cjoin = apply_filters_ref_array('comment_feed_join', array( $cjoin, &$this ) );
-				$cwhere = apply_filters('comment_feed_where', $cwhere);
+				$cwhere = apply_filters_ref_array('comment_feed_where', array( $cwhere, &$this ) );
-				$cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( $cgroupby, &$this ) );
-				$corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC');
+				$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
-				$climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'));
+				$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
 			}
 			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
 			$this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
 			$this->comment_count = count($this->comments);
 			$post_ids = array();
-			foreach ($this->comments as $comment)
+			foreach ( $this->comments as $comment )
 				$post_ids[] = (int) $comment->comment_post_ID;
 			$post_ids = join(',', $post_ids);
 			$join = '';
 			if ( $post_ids )
 				$where = "AND $wpdb->posts.ID IN ($post_ids) ";
 			else
 				$where = "AND 0";
 		}
-		$orderby = $q['orderby'];
+		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
-		// Apply post-paging filters on where and join.  Only plugins that
+		// Apply post-paging filters on where and join. Only plugins that
 		// manipulate paging queries should use these hooks.
 		if ( !$q['suppress_filters'] ) {
-			$where = apply_filters('posts_where_paged', $where);
+			$where		= apply_filters_ref_array( 'posts_where_paged',	array( $where, &$this ) );
-			$groupby = apply_filters('posts_groupby', $groupby);
+			$groupby	= apply_filters_ref_array( 'posts_groupby',		array( $groupby, &$this ) );
-			$join = apply_filters('posts_join_paged', $join);
+			$join		= apply_filters_ref_array( 'posts_join_paged',	array( $join, &$this ) );
-			$orderby = apply_filters('posts_orderby', $orderby);
+			$orderby	= apply_filters_ref_array( 'posts_orderby',		array( $orderby, &$this ) );
-			$distinct = apply_filters('posts_distinct', $distinct);
+			$distinct	= apply_filters_ref_array( 'posts_distinct',	array( $distinct, &$this ) );
-			$limits = apply_filters( 'post_limits', $limits );
+			$limits		= apply_filters_ref_array( 'post_limits',		array( $limits, &$this ) );
+			$fields		= apply_filters_ref_array( 'posts_fields',		array( $fields, &$this ) );
-			$fields = apply_filters('posts_fields', $fields);
-		}
+			// Filter all clauses at once, for convenience
+			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
-		// Announce current selection parameters.  For use by caching plugins.
+			foreach ( $pieces as $piece )
+				$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+		}
+		// Announce current selection parameters. For use by caching plugins.
 		do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
-		// Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
+		// Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
 		if ( !$q['suppress_filters'] ) {
-			$where = apply_filters('posts_where_request', $where);
+			$where		= apply_filters_ref_array( 'posts_where_request',		array( $where, &$this ) );
-			$groupby = apply_filters('posts_groupby_request', $groupby);
+			$groupby	= apply_filters_ref_array( 'posts_groupby_request',		array( $groupby, &$this ) );
-			$join = apply_filters('posts_join_request', $join);
+			$join		= apply_filters_ref_array( 'posts_join_request',		array( $join, &$this ) );
-			$orderby = apply_filters('posts_orderby_request', $orderby);
+			$orderby	= apply_filters_ref_array( 'posts_orderby_request',		array( $orderby, &$this ) );
-			$distinct = apply_filters('posts_distinct_request', $distinct);
+			$distinct	= apply_filters_ref_array( 'posts_distinct_request',	array( $distinct, &$this ) );
-			$fields = apply_filters('posts_fields_request', $fields);
+			$fields		= apply_filters_ref_array( 'posts_fields_request',		array( $fields, &$this ) );
-			$limits = apply_filters( 'post_limits_request', $limits );
+			$limits		= apply_filters_ref_array( 'post_limits_request',		array( $limits, &$this ) );
+			// Filter all clauses at once, for convenience
+			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
+			foreach ( $pieces as $piece )
+				$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 		}
 		if ( ! empty($groupby) )
 			$groupby = 'GROUP BY ' . $groupby;
 		if ( !empty( $orderby ) )
 			$orderby = 'ORDER BY ' . $orderby;
 		$found_rows = '';
-		if ( !empty($limits) )
+		if ( !$q['no_found_rows'] && !empty($limits) )
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
-		$this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+		if ( !$q['suppress_filters'] ) {
+			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+		}
+		if ( 'ids' == $q['fields'] ) {
+			$this->posts = $wpdb->get_col($this->request);
+			return $this->posts;
+		}
+		if ( 'id=>parent' == $q['fields'] ) {
+			$this->posts = $wpdb->get_results($this->request);
+			$r = array();
+			foreach ( $this->posts as $post )
+				$r[ $post->ID ] = $post->post_parent;
+			return $r;
+		}
+		$split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+		$split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+		if ( $split_the_query ) {
+			// First get the IDs and then fill in the objects
+			$this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+			$this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+			$ids = $wpdb->get_col( $this->request );
+			if ( $ids ) {
+				$this->set_found_posts( $q, $limits );
+				_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				$this->posts = array_map( 'get_post', $ids );
+			} else {
+				$this->found_posts = $this->max_num_pages = 0;
+				$this->posts = array();
+			}
+		} else {
+			$this->posts = $wpdb->get_results( $this->request );
+			$this->set_found_posts( $q, $limits );
+		}
+		// Raw results filter. Prior to status checks.
 		if ( !$q['suppress_filters'] )
-			$this->request = apply_filters('posts_request', $this->request);
+			$this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
-		$this->posts = $wpdb->get_results($this->request);
-		// Raw results filter.  Prior to status checks.
-		if ( !$q['suppress_filters'] )
-			$this->posts = apply_filters('posts_results', $this->posts);
 		if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
-			$cjoin = apply_filters('comment_feed_join', '');
+			$cjoin = apply_filters_ref_array('comment_feed_join', array( '', &$this ) );
-			$cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'");
+			$cwhere = apply_filters_ref_array('comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
-			$cgroupby = apply_filters('comment_feed_groupby', '');
+			$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( '', &$this ) );
 			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC');
+			$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
-			$climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'));
+			$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
 			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits";
 			$this->comments = $wpdb->get_results($comments_request);
 			$this->comment_count = count($this->comments);
 		}
-		if ( !empty($limits) ) {
-			$found_posts_query = apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()' );
-			$this->found_posts = $wpdb->get_var( $found_posts_query );
-			$this->found_posts = apply_filters( 'found_posts', $this->found_posts );
-			$this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
-		}
 		// Check post status to determine if post should be displayed.
 		if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
 			$status = get_post_status($this->posts[0]);
+			$post_status_obj = get_post_status_object($status);
 			//$type = get_post_type($this->posts[0]);
-			if ( ('publish' != $status) ) {
+			if ( !$post_status_obj->public ) {
 				if ( ! is_user_logged_in() ) {
 					// User must be logged in to view unpublished posts.
 					$this->posts = array();
 				} else {
-					if  (in_array($status, array('draft', 'pending')) ) {
+					if  ( $post_status_obj->protected ) {
 						// User must have edit permissions on the draft to preview.
-						if (! current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
+						if ( ! current_user_can($edit_cap, $this->posts[0]->ID) ) {
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							$this->posts[0]->post_date = current_time('mysql');
+							if ( 'future' != $status )
+								$this->posts[0]->post_date = current_time('mysql');
 						}
-					}  else if ('future' == $status) {
+					} elseif ( $post_status_obj->private ) {
-						$this->is_preview = true;
+						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
-						if (!current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
+							$this->posts = array();
-							$this->posts = array ( );
-						}
 					} else {
-						if (! current_user_can("read_$post_type_cap", $this->posts[0]->ID))
+						$this->posts = array();
-							$this->posts = array();
 					}
 				}
 			}
-			if ( $this->is_preview && current_user_can( "edit_{$post_type_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('the_preview', $this->posts[0]);
+				$this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], &$this ));
 		}
 		// Put sticky posts at the top of the posts array
 		$sticky_posts = get_option('sticky_posts');
-		if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['caller_get_posts'] ) {
+		if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) {
 			$num_posts = count($this->posts);
 			$sticky_offset = 0;
 			// Loop over posts and relocate stickies to the front.
 			for ( $i = 0; $i < $num_posts; $i++ ) {
 				if ( in_array($this->posts[$i]->ID, $sticky_posts) ) {
 					$sticky_post = $this->posts[$i];
 					// Remove sticky from current position
 					array_splice($this->posts, $i, 1);
 					// Move to front, after other stickies
 					array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
-					// Increment the sticky offset.  The next sticky will be placed at this offset.
+					// Increment the sticky offset. The next sticky will be placed at this offset.
 					$sticky_offset++;
 					// Remove post from sticky posts array
 					$offset = array_search($sticky_post->ID, $sticky_posts);
-					array_splice($sticky_posts, $offset, 1);
+					unset( $sticky_posts[$offset] );
 				}
 			}
+			// If any posts have been excluded specifically, Ignore those that are sticky.
+			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
+				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
 			// 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
 					} else {
 						$post_types = $post_type;
 					}
 					$stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')";
 				}
 				$stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" );
-				/** @todo Make sure post is published or viewable by the current user */
 				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++;
 				}
 			}
 		}
 		if ( !$q['suppress_filters'] )
-			$this->posts = apply_filters('the_posts', $this->posts);
+			$this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) );
 		$this->post_count = count($this->posts);
-		// Sanitize before caching so it'll only get done once
+		// Always sanitize
-		for ($i = 0; $i < $this->post_count; $i++) {
+		foreach ( $this->posts as $i => $post ) {
-			$this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
+			$this->posts[$i] = sanitize_post( $post, 'raw' );
 		}
-		update_post_caches($this->posts);
+		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) {
+		if ( $this->post_count > 0 ) {
 			$this->post = $this->posts[0];
 		}
 		return $this->posts;
 	}
-	/**
+	function set_found_posts( $q, $limits ) {
-	 * Setup the next post and iterate current post index.
+		global $wpdb;
+		if ( $q['no_found_rows'] || empty( $limits ) )
+			return;
+		$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$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'] );
+	}
+	/**
+	 * Set up the next post and iterate current post index.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 *
 	 * @return object Next post.
 	 * @uses do_action_ref_array() Calls 'loop_end' if loop is ended
 	 *
 	 * @return bool True if posts are available, false if end of loop.
 	 */
 	function have_posts() {
-		if ($this->current_post + 1 < $this->post_count) {
+		if ( $this->current_post + 1 < $this->post_count ) {
 			return true;
-		} elseif ($this->current_post + 1 == $this->post_count && $this->post_count > 0) {
+		} elseif ( $this->current_post + 1 == $this->post_count && $this->post_count > 0 ) {
 			do_action_ref_array('loop_end', array(&$this));
 			// Do some cleaning up after the loop
 			$this->rewind_posts();
 		}
 	 * @since 1.5.0
 	 * @access public
 	 */
 	function rewind_posts() {
 		$this->current_post = -1;
-		if ($this->post_count > 0) {
+		if ( $this->post_count > 0 ) {
 			$this->post = $this->posts[0];
 		}
 	}
 	/**
 	function the_comment() {
 		global $comment;
 		$comment = $this->next_comment();
-		if ($this->current_comment == 0) {
+		if ( $this->current_comment == 0 ) {
 			do_action('comment_loop_start');
 		}
 	}
 	/**
 	 * @access public
 	 *
 	 * @return bool True, if more comments. False, if no more posts.
 	 */
 	function have_comments() {
-		if ($this->current_comment + 1 < $this->comment_count) {
+		if ( $this->current_comment + 1 < $this->comment_count ) {
 			return true;
-		} elseif ($this->current_comment + 1 == $this->comment_count) {
+		} elseif ( $this->current_comment + 1 == $this->comment_count ) {
 			$this->rewind_comments();
 		}
 		return false;
 	}
 	 * @since 2.2.0
 	 * @access public
 	 */
 	function rewind_comments() {
 		$this->current_comment = -1;
-		if ($this->comment_count > 0) {
+		if ( $this->comment_count > 0 ) {
 			$this->comment = $this->comments[0];
 		}
 	}
 	/**
 	 * @access public
 	 *
 	 * @param string $query URL query string.
 	 * @return array List of posts.
 	 */
-	function &query($query) {
+	function &query( $query ) {
-		$this->parse_query($query);
+		$this->init();
+		$this->query = $this->query_vars = wp_parse_args( $query );
 		return $this->get_posts();
 	}
 	/**
 	 * Retrieve queried object.
 	 * @access public
 	 *
 	 * @return object
 	 */
 	function get_queried_object() {
-		if (isset($this->queried_object)) {
+		if ( isset($this->queried_object) )
 			return $this->queried_object;
-		}
+		$this->queried_object = null;
-		$this->queried_object = NULL;
 		$this->queried_object_id = 0;
-		if ($this->is_category) {
+		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-			$cat = $this->get('cat');
+			$tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
-			$category = &get_category($cat);
-			if ( is_wp_error( $category ) )
+			$query = reset( $tax_query_in_and );
-				return NULL;
-			$this->queried_object = &$category;
+			if ( 'term_id' == $query['field'] )
-			$this->queried_object_id = (int) $cat;
+				$term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-		} else if ($this->is_tag) {
+			else
-			$tag_id = $this->get('tag_id');
+				$term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
-			$tag = &get_term($tag_id, 'post_tag');
-			if ( is_wp_error( $tag ) )
+			if ( $term && ! is_wp_error($term) )  {
-				return NULL;
+				$this->queried_object = $term;
-			$this->queried_object = &$tag;
+				$this->queried_object_id = (int) $term->term_id;
-			$this->queried_object_id = (int) $tag_id;
-		} else if ($this->is_tax) {
+				if ( $this->is_category )
-			$tax = $this->get('taxonomy');
+					_make_cat_compat( $this->queried_object );
-			$slug = $this->get('term');
+			}
-			$term = &get_terms($tax, array('slug'=>$slug));
+		} elseif ( $this->is_post_type_archive ) {
-			if ( is_wp_error($term) || empty($term) )
+			$this->queried_object = get_post_type_object( $this->get('post_type') );
-				return NULL;
+		} elseif ( $this->is_posts_page ) {
-			$term = $term[0];
+			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = $term;
+			$this->queried_object = get_page( $page_for_posts );
-			$this->queried_object_id = $term->term_id;
-		} else if ($this->is_posts_page) {
-			$this->queried_object = & get_page(get_option('page_for_posts'));
 			$this->queried_object_id = (int) $this->queried_object->ID;
-		} else if ($this->is_single) {
+		} elseif ( $this->is_singular && !is_null($this->post) ) {
 			$this->queried_object = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
-		} else if ($this->is_page) {
+		} elseif ( $this->is_author ) {
-			$this->queried_object = $this->post;
+			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object_id = (int) $this->post->ID;
+			$this->queried_object = get_userdata( $this->queried_object_id );
-		} else if ($this->is_author) {
-			$author_id = (int) $this->get('author');
-			$author = get_userdata($author_id);
-			$this->queried_object = $author;
-			$this->queried_object_id = $author_id;
 		}
 		return $this->queried_object;
 	}
 	 * @return int
 	 */
 	function get_queried_object_id() {
 		$this->get_queried_object();
-		if (isset($this->queried_object_id)) {
+		if ( isset($this->queried_object_id) ) {
 			return $this->queried_object_id;
 		}
 		return 0;
 	}
 	/**
-	 * PHP4 type constructor.
+	 * Constructor.
 	 *
 	 * Sets up the WordPress query, if parameter is not empty.
 	 *
 	 * @since 1.5.0
 	 * @access public
 	 *
 	 * @param string $query URL query string.
 	 * @return WP_Query
 	 */
-	function WP_Query ($query = '') {
+	function __construct($query = '') {
-		if (! empty($query)) {
+		if ( ! empty($query) ) {
 			$this->query($query);
 		}
+	}
+	/**
+	 * Is the query for an archive page?
+	 *
+	 * Month, Year, Category, Author, Post Type archive...
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_archive() {
+		return (bool) $this->is_archive;
+	}
+	/**
+	 * Is the query for a post type archive page?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $post_types Optional. Post type or array of posts types to check against.
+	 * @return bool
+	 */
+	function is_post_type_archive( $post_types = '' ) {
+		if ( empty( $post_types ) || !$this->is_post_type_archive )
+			return (bool) $this->is_post_type_archive;
+		$post_type_object = $this->get_queried_object();
+		return in_array( $post_type_object->name, (array) $post_types );
+	}
+	/**
+	 * Is the query for an attachment page?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_attachment() {
+		return (bool) $this->is_attachment;
+	}
+	/**
+	 * Is the query for an author archive page?
+	 *
+	 * If the $author parameter is specified, this function will additionally
+	 * check if the query is for one of the authors specified.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
+	 * @return bool
+	 */
+	function is_author( $author = '' ) {
+		if ( !$this->is_author )
+			return false;
+		if ( empty($author) )
+			return true;
+		$author_obj = $this->get_queried_object();
+		$author = (array) $author;
+		if ( in_array( $author_obj->ID, $author ) )
+			return true;
+		elseif ( in_array( $author_obj->nickname, $author ) )
+			return true;
+		elseif ( in_array( $author_obj->user_nicename, $author ) )
+			return true;
+		return false;
+	}
+	/**
+	 * Is the query for a category archive page?
+	 *
+	 * If the $category parameter is specified, this function will additionally
+	 * check if the query is for one of the categories specified.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
+	 * @return bool
+	 */
+	function is_category( $category = '' ) {
+		if ( !$this->is_category )
+			return false;
+		if ( empty($category) )
+			return true;
+		$cat_obj = $this->get_queried_object();
+		$category = (array) $category;
+		if ( in_array( $cat_obj->term_id, $category ) )
+			return true;
+		elseif ( in_array( $cat_obj->name, $category ) )
+			return true;
+		elseif ( in_array( $cat_obj->slug, $category ) )
+			return true;
+		return false;
+	}
+	/**
+	 * Is the query for a 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
+	 *
+	 * @param mixed $slug Optional. Tag slug or array of slugs.
+	 * @return bool
+	 */
+	function is_tag( $slug = '' ) {
+		if ( !$this->is_tag )
+			return false;
+		if ( empty( $slug ) )
+			return true;
+		$tag_obj = $this->get_queried_object();
+		$slug = (array) $slug;
+		if ( in_array( $tag_obj->slug, $slug ) )
+			return true;
+		return false;
+	}
+	/**
+	 * Is the query for a taxonomy archive page?
+	 *
+	 * If the $taxonomy parameter is specified, this function will additionally
+	 * check if the query is for that specific $taxonomy.
+	 *
+	 * If the $term parameter is specified in addition to the $taxonomy parameter,
+	 * this function will additionally check if the query is for one of the terms
+	 * specified.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $taxonomy Optional. Taxonomy slug or slugs.
+	 * @param mixed $term. Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
+	 * @return bool
+	 */
+	function is_tax( $taxonomy = '', $term = '' ) {
+		global $wp_taxonomies;
+		if ( !$this->is_tax )
+			return false;
+		if ( empty( $taxonomy ) )
+			return true;
+		$queried_object = $this->get_queried_object();
+		$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 );
+		return isset( $queried_object->term_id ) &&
+			count( array_intersect(
+				array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
+				$term_array
+			) );
+	}
+	/**
+	 * Whether the current URL is within the comments popup window.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_comments_popup() {
+		return (bool) $this->is_comments_popup;
+	}
+	/**
+	 * Is the query for a date archive?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_date() {
+		return (bool) $this->is_date;
+	}
+	/**
+	 * Is the query for a day archive?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_day() {
+		return (bool) $this->is_day;
+	}
+	/**
+	 * Is the query for a feed?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string|array $feeds Optional feed types to check.
+	 * @return bool
+	 */
+	function is_feed( $feeds = '' ) {
+		if ( empty( $feeds ) || ! $this->is_feed )
+			return (bool) $this->is_feed;
+		$qv = $this->get( 'feed' );
+		if ( 'feed' == $qv )
+			$qv = get_default_feed();
+		return in_array( $qv, (array) $feeds );
+	}
+	/**
+	 * Is the query for a comments feed?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_comment_feed() {
+		return (bool) $this->is_comment_feed;
+	}
+	/**
+	 * Is the query for the front page of the site?
+	 *
+	 * This is for what is displayed at your site's main URL.
+	 *
+	 * Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_on_front'.
+	 *
+	 * If you set a static page for the front page of your site, this function will return
+	 * true when viewing that page.
+	 *
+	 * Otherwise the same as @see WP_Query::is_home()
+	 *
+	 * @since 3.1.0
+	 * @uses is_home()
+	 * @uses get_option()
+	 *
+	 * @return bool True, if front of site.
+	 */
+	function is_front_page() {
+		// most likely case
+		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
+			return true;
+		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
+			return true;
+		else
+			return false;
+	}
+	/**
+	 * Is the query for the blog homepage?
+	 *
+	 * This is the page which shows the time based blog content of your site.
+	 *
+	 * Depends on the site's "Front page displays" Reading Settings 'show_on_front' and 'page_for_posts'.
+	 *
+	 * If you set a static page for the front page of your site, this function will return
+	 * true only on the page you set as the "Posts page".
+	 *
+	 * @see WP_Query::is_front_page()
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool True if blog view homepage.
+	 */
+	function is_home() {
+		return (bool) $this->is_home;
+	}
+	/**
+	 * Is the query for a month archive?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_month() {
+		return (bool) $this->is_month;
+	}
+	/**
+	 * Is the query for a single page?
+	 *
+	 * If the $page parameter is specified, this function will additionally
+	 * check if the query is for one of the pages specified.
+	 *
+	 * @see WP_Query::is_single()
+	 * @see WP_Query::is_singular()
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $page Page ID, title, slug, or array of such.
+	 * @return bool
+	 */
+	function is_page( $page = '' ) {
+		if ( !$this->is_page )
+			return false;
+		if ( empty( $page ) )
+			return true;
+		$page_obj = $this->get_queried_object();
+		$page = (array) $page;
+		if ( in_array( $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 ) )
+			return true;
+		return false;
+	}
+	/**
+	 * Is the query for paged result and not for the first page?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_paged() {
+		return (bool) $this->is_paged;
+	}
+	/**
+	 * Is the query for a post or page preview?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_preview() {
+		return (bool) $this->is_preview;
+	}
+	/**
+	 * Is the query for the robots file?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_robots() {
+		return (bool) $this->is_robots;
+	}
+	/**
+	 * Is the query for a search?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_search() {
+		return (bool) $this->is_search;
+	}
+	/**
+	 * Is the query for a single post?
+	 *
+	 * Works for any post type, except attachments and pages
+	 *
+	 * If the $post parameter is specified, this function will additionally
+	 * check if the query is for one of the Posts specified.
+	 *
+	 * @see WP_Query::is_page()
+	 * @see WP_Query::is_singular()
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $post Post ID, title, slug, or array of such.
+	 * @return bool
+	 */
+	function is_single( $post = '' ) {
+		if ( !$this->is_single )
+			return false;
+		if ( empty($post) )
+			return true;
+		$post_obj = $this->get_queried_object();
+		$post = (array) $post;
+		if ( in_array( $post_obj->ID, $post ) )
+			return true;
+		elseif ( in_array( $post_obj->post_title, $post ) )
+			return true;
+		elseif ( in_array( $post_obj->post_name, $post ) )
+			return true;
+		return false;
+	}
+	/**
+	 * Is the query for a 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.
+	 *
+	 * @see WP_Query::is_page()
+	 * @see WP_Query::is_single()
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param mixed $post_types Optional. Post Type or array of Post Types
+	 * @return bool
+	 */
+	function is_singular( $post_types = '' ) {
+		if ( empty( $post_types ) || !$this->is_singular )
+			return (bool) $this->is_singular;
+		$post_obj = $this->get_queried_object();
+		return in_array( $post_obj->post_type, (array) $post_types );
+	}
+	/**
+	 * Is the query for a specific time?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_time() {
+		return (bool) $this->is_time;
+	}
+	/**
+	 * Is the query for a trackback endpoint call?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_trackback() {
+		return (bool) $this->is_trackback;
+	}
+	/**
+	 * Is the query for a specific year?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_year() {
+		return (bool) $this->is_year;
+	}
+	/**
+	 * Is the query a 404 (returns no results)?
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
+	function is_404() {
+		return (bool) $this->is_404;
+	}
+	/**
+	 * Is the query the main query?
+	 *
+	 * @since 3.3.0
+	 *
+	 * @return bool
+	 */
+	function is_main_query() {
+		global $wp_the_query;
+		return $wp_the_query === $this;
 	}
 }
 /**
 * Redirect old slugs to the correct permalink.
 * @uses $wp_query
 * @uses $wpdb
 *
 * @return null If no link is found, null is returned.
 */
-function wp_old_slug_redirect () {
+function wp_old_slug_redirect() {
 	global $wp_query;
 	if ( is_404() && '' != $wp_query->query_vars['name'] ) :
 		global $wpdb;
-		$query = "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND meta_key = '_wp_old_slug' AND meta_value='" . $wp_query->query_vars['name'] . "'";
+		// Guess the current post_type based on the query vars.
+		if ( get_query_var('post_type') )
+			$post_type = get_query_var('post_type');
+		elseif ( !empty($wp_query->query_vars['pagename']) )
+			$post_type = 'page';
+		else
+			$post_type = 'post';
+		if ( is_array( $post_type ) ) {
+			if ( count( $post_type ) > 1 )
+				return;
+			$post_type = array_shift( $post_type );
+		}
+		// Do not attempt redirect for hierarchical post types
+		if ( is_post_type_hierarchical( $post_type ) )
+			return;
+		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, $wp_query->query_vars['name']);
 		// if year, monthnum, or day have been specified, make our query more precise
 		// just in case there are multiple identical _wp_old_slug values
 		if ( '' != $wp_query->query_vars['year'] )
-			$query .= " AND YEAR(post_date) = '{$wp_query->query_vars['year']}'";
+			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
 		if ( '' != $wp_query->query_vars['monthnum'] )
-			$query .= " AND MONTH(post_date) = '{$wp_query->query_vars['monthnum']}'";
+			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
 		if ( '' != $wp_query->query_vars['day'] )
-			$query .= " AND DAYOFMONTH(post_date) = '{$wp_query->query_vars['day']}'";
+			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
 		$id = (int) $wpdb->get_var($query);
-		if ( !$id )
+		if ( ! $id )
 			return;
 		$link = get_permalink($id);
 		if ( !$link )
 			return;
-		wp_redirect($link, '301'); // Permanent redirect
+		wp_redirect( $link, 301 ); // Permanent redirect
 		exit;
 	endif;
 }
 /**
-* Setup global post data.
+* Set up global post data.
 *
 * @since 1.5.0
 *
 * @param object $post Post data.
 * @uses do_action_ref_array() Calls 'the_post'
 * @return bool True when finished.
 */
 function setup_postdata($post) {
-	global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
+	global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 	$id = (int) $post->ID;
 	$authordata = get_userdata($post->post_author);
-	$day = mysql2date('d.m.y', $post->post_date, false);
+	$currentday = mysql2date('d.m.y', $post->post_date, false);
 	$currentmonth = mysql2date('m', $post->post_date, false);
 	$numpages = 1;
 	$page = get_query_var('page');
 	if ( !$page )
 		$page = 1;
 		$content = str_replace("\n<!--nextpage-->", '<!--nextpage-->', $content);
 		$content = str_replace("<!--nextpage-->\n", '<!--nextpage-->', $content);
 		$pages = explode('<!--nextpage-->', $content);
 		$numpages = count($pages);
 	} else {
-		$pages[0] = $post->post_content;
+		$pages = array( $post->post_content );
 		$multipage = 0;
 	}
 	do_action_ref_array('the_post', array(&$post));
 	return true;
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b