Changes from trunk/wp-includes/query.php at r17455 to branches/3.0/wp-includes/query.php at r15470

File:

• branches/3.0/wp-includes/query.php (modified) (45 diffs)

branches/3.0/wp-includes/query.php

@@ -26 +26 @@
 
         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();
 }
 
@@ -130 +99 @@
 
 /**
- * Is the query for an archive page?
- *
- * Month, Year, Category, Author, Post Type archive...
- *
- * @see WP_Query::is_archive()
+ * Is query requesting an archive page.
+ *
  * @since 1.5.0
  * @uses $wp_query
  *
+ * @return bool True if page is archive.
+ */
+function is_archive() {
+        global $wp_query;
+
+        return $wp_query->is_archive;
+}
+
+/**
+ * Is query requesting an attachment page.
+ *
+ * @since 2.0.0
+ * @uses $wp_query
+ *
+ * @return bool True if page is attachment.
+ */
+function is_attachment() {
+        global $wp_query;
+
+        return $wp_query->is_attachment;
+}
+
+/**
+ * Is query requesting an author page.
+ *
+ * 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.
+ *
+ * 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
+ * 'true' will be returned.
+ *
+ * If matching against strings, then the test will be matched against both the
+ * 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.
+ * @return bool True if page is author or $author (if set).
+ */
+function is_author($author = '') {
+        global $wp_query;
+
+        if ( !$wp_query->is_author )
+                return false;
+
+        if ( empty($author) )
+                return true;
+
+        $author_obj = $wp_query->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;
+}
+
+/**
+ * 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.
  * @return bool
  */
-function is_archive() {
-        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' );
+function is_category($category = '') {
+        global $wp_query;
+
+        if ( !$wp_query->is_category )
                 return false;
-        }
-
-        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.
+
+        if ( empty($category) )
+                return true;
+
+        $cat_obj = $wp_query->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;
+}
+
+/**
+ * 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.
  * @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' );
+function is_tag( $slug = '' ) {
+        global $wp_query;
+
+        if ( !$wp_query->is_tag )
                 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
- *
+
+        if ( empty( $slug ) )
+                return true;
+
+        $tag_obj = $wp_query->get_queried_object();
+
+        $slug = (array) $slug;
+
+        if ( in_array( $tag_obj->slug, $slug ) )
+                return true;
+
+        return false;
+}
+
+/**
+ * Whether the current query is for the given taxonomy and/or term.
+ *
+ * If no taxonomy argument is set, returns true if any taxonomy is queried.
+ * If the taxonomy argument is passed but no term argument, returns true
+ *    if the taxonomy or taxonomies in the argument are being queried.
+ * If both taxonomy and term arguments are passed, returns true
+ *    if the current query is for a term contained in the terms argument
+ *    which has a taxonomy contained in the taxonomy argument.
+ *
+ * @since 2.5.0
+ * @uses $wp_query
+ *
+ * @param string|array $taxonomy Optional. Taxonomy slug or slugs to check in current query.
+ * @param int|array|string $term. Optional. A single or array of, The term's ID, Name or Slug
  * @return bool
  */
-function is_attachment() {
-        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' );
+function is_tax( $taxonomy = '', $term = '' ) {
+        global $wp_query, $wp_taxonomies;
+
+        $queried_object = $wp_query->get_queried_object();
+        $tax_array = array_intersect(array_keys($wp_taxonomies), (array) $taxonomy);
+        $term_array = (array) $term;
+
+        if ( !$wp_query->is_tax )
                 return false;
-        }
-
-        return $wp_query->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.
- *
- * @see WP_Query::is_author()
+
+        if ( empty( $taxonomy ) )
+                return true;
+
+        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 1.5.0
  * @uses $wp_query
  *
- * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
  * @return bool
  */
-function is_author( $author = '' ) {
-        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_author( $author );
-}
-
-/**
- * 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.
- *
- * @see WP_Query::is_category()
+function is_comments_popup() {
+        global $wp_query;
+
+        return $wp_query->is_comments_popup;
+}
+
+/**
+ * Whether current URL is based on a date.
+ *
  * @since 1.5.0
  * @uses $wp_query
  *
- * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
  * @return bool
  */
-function is_category( $category = '' ) {
-        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_category( $category );
-}
-
-/**
- * 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.
- *
- * @see WP_Query::is_tag()
- * @since 2.3.0
- * @uses $wp_query
- *
- * @param mixed $slug Optional. Tag slug or array of slugs.
+function is_date() {
+        global $wp_query;
+
+        return $wp_query->is_date;
+}
+
+/**
+ * Whether current blog URL contains a day.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
  * @return bool
  */
-function is_tag( $slug = '' ) {
-        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_tag( $slug );
-}
-
-/**
- * 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.
- *
- * @see WP_Query::is_tax()
- * @since 2.5.0
- * @uses $wp_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.
+function is_day() {
+        global $wp_query;
+
+        return $wp_query->is_day;
+}
+
+/**
+ * Whether current page query is feed URL.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
  * @return bool
  */
-function is_tax( $taxonomy = '', $term = '' ) {
-        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_tax( $taxonomy, $term );
-}
-
-/**
- * Whether the current URL is within the comments popup window.
- *
- * @see WP_Query::is_comments_popup()
- * @since 1.5.0
+function is_feed() {
+        global $wp_query;
+
+        return $wp_query->is_feed;
+}
+
+/**
+ * Whether current page query is comment feed URL.
+ *
+ * @since 3.0.0
  * @uses $wp_query
  *
  * @return bool
  */
-function is_comments_popup() {
-        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_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() {
-        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_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() {
-        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_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( $feeds = '' ) {
-        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_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()
+        return $wp_query->is_comment_feed;
+}
+
+/**
+ * Whether current page query is the front of the site.
+ *
  * @since 2.5.0
  * @uses is_home()
@@ -414 +352 @@
  */
 function is_front_page() {
-        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' );
+        // most likely case
+        if ( 'posts' == get_option('show_on_front') && is_home() )
+                return true;
+        elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') && is_page(get_option('page_on_front')) )
+                return true;
+        else
                 return false;
-        }
-
-        return $wp_query->is_front_page();
-}
-
-/**
- * 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()
+}
+
+/**
+ * Whether current page view is the blog homepage.
+ *
+ * This is the page which is showing the time based blog content of your site
+ * so if you set a static page for the front page of your site then this will
+ * only be true on the page which you set as the "Posts page" in Reading Settings.
+ *
  * @since 1.5.0
  * @uses $wp_query
@@ -445 +376 @@
         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 $wp_query->is_home;
+}
+
+/**
+ * Whether current page query contains a month.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
+ * @return bool
+ */
+function is_month() {
+        global $wp_query;
+
+        return $wp_query->is_month;
+}
+
+/**
+ * Whether query is page or contains given page(s).
+ *
+ * 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.
+ *
+ * The parameter can contain the page ID, page title, or page name. The
+ * parameter can also be an array of those three values.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
+ * @param mixed $page Either page or list of pages to test against.
+ * @return bool
+ */
+function is_page($page = '') {
+        global $wp_query;
+
+        if ( !$wp_query->is_page )
                 return false;
-        }
-
-        return $wp_query->is_home();
-}
-
-/**
- * Is the query for a month archive?
- *
- * @see WP_Query::is_month()
+
+        if ( empty($page) )
+                return true;
+
+        $page_obj = $wp_query->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;
+}
+
+/**
+ * Whether query contains multiple pages for the results.
+ *
  * @since 1.5.0
  * @uses $wp_query
@@ -462 +441 @@
  * @return bool
  */
-function is_month() {
-        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' );
+function is_paged() {
+        global $wp_query;
+
+        return $wp_query->is_paged;
+}
+
+/**
+ * Whether the current page was created by a plugin.
+ *
+ * The plugin can set this by using the global $plugin_page and setting it to
+ * true.
+ *
+ * @since 1.5.0
+ * @global bool $plugin_page Used by plugins to tell the query that current is a plugin page.
+ *
+ * @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;
+}
+
+/**
+ * Whether the current query post is robots.
+ *
+ * @since 2.1.0
+ * @uses $wp_query
+ *
+ * @return bool
+ */
+function is_robots() {
+        global $wp_query;
+
+        return $wp_query->is_robots;
+}
+
+/**
+ * Whether current query is the result of a user search.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
+ * @return bool
+ */
+function is_search() {
+        global $wp_query;
+
+        return $wp_query->is_search;
+}
+
+/**
+ * Whether the current page query is single page.
+ *
+ * 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
+ * the current query has only a single object.
+ *
+ * @since 1.5.0
+ * @uses $wp_query
+ *
+ * @param mixed $post Either post or list of posts to test against.
+ * @return bool
+ */
+function is_single($post = '') {
+        global $wp_query;
+
+        if ( !$wp_query->is_single )
                 return false;
-        }
-
-        return $wp_query->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 is_single()
- * @see is_singular()
- *
- * @see WP_Query::is_page()
+
+        if ( empty($post) )
+                return true;
+
+        $post_obj = $wp_query->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;
+}
+
+/**
+ * Whether is single post, is a page, or is an attachment.
+ *
  * @since 1.5.0
  * @uses $wp_query
  *
- * @param mixed $page Page ID, title, slug, or array of such.
+ * @param string|array $post_types Optional. Post type or types to check in current query.
  * @return bool
  */
-function is_page( $page = '' ) {
-        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_page( $page );
-}
-
-/**
- * Is the query for paged result and not for the first page?
- *
- * @see WP_Query::is_paged()
+function is_singular($post_types = '') {
+        global $wp_query;
+
+        if ( empty($post_types) || !$wp_query->is_singular )
+                return $wp_query->is_singular;
+
+        $post_obj = $wp_query->get_queried_object();
+
+        return in_array($post_obj->post_type, (array) $post_types);
+}
+
+/**
+ * Whether the query contains a time.
+ *
  * @since 1.5.0
  * @uses $wp_query
@@ -509 +575 @@
  * @return bool
  */
-function is_paged() {
-        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_paged();
-}
-
-/**
- * Is the query for a post or page preview?
- *
- * @see WP_Query::is_preview()
- * @since 2.0.0
+function is_time() {
+        global $wp_query;
+
+        return $wp_query->is_time;
+}
+
+/**
+ * Whether the query is a trackback.
+ *
+ * @since 1.5.0
  * @uses $wp_query
  *
  * @return bool
  */
-function is_preview() {
-        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_preview();
-}
-
-/**
- * Is the query for the robots file?
- *
- * @see WP_Query::is_robots()
- * @since 2.1.0
+function is_trackback() {
+        global $wp_query;
+
+        return $wp_query->is_trackback;
+}
+
+/**
+ * Whether the query contains a year.
+ *
+ * @since 1.5.0
  * @uses $wp_query
  *
  * @return bool
  */
-function is_robots() {
-        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_robots();
-}
-
-/**
- * Is the query for a search?
- *
- * @see WP_Query::is_search()
+function is_year() {
+        global $wp_query;
+
+        return $wp_query->is_year;
+}
+
+/**
+ * Whether current page query is a 404 and no results for WordPress query.
+ *
  * @since 1.5.0
  * @uses $wp_query
  *
- * @return bool
- */
-function is_search() {
-        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_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 is_page()
- * @see is_singular()
- *
- * @see WP_Query::is_single()
- * @since 1.5.0
- * @uses $wp_query
- *
- * @param mixed $post Post ID, title, slug, or array of such.
- * @return bool
- */
-function is_single( $post = '' ) {
-        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_single( $post );
-}
-
-/**
- * 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 is_page()
- * @see is_single()
- *
- * @see WP_Query::is_singular()
- * @since 1.5.0
- * @uses $wp_query
- *
- * @param mixed $post_types Optional. Post Type or array of Post Types
- * @return bool
- */
-function is_singular( $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_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() {
-        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_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() {
-        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_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() {
-        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_year();
-}
-
-/**
- * Is the query a 404 (returns no results)?
- *
- * @see WP_Query::is_404()
- * @since 1.5.0
- * @uses $wp_query
- *
- * @return bool
+ * @return bool True, if nothing is found matching WordPress Query.
  */
 function is_404() {
         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_404();
+        return $wp_query->is_404;
 }
 
@@ -823 +730 @@
 
         /**
-         * Query vars set by the user
+         * Query string
+         *
+         * @since 1.5.0
+         * @access public
+         * @var string
+         */
+        var $query;
+
+        /**
+         * Query search variables set by the user.
          *
          * @since 1.5.0
@@ -829 +745 @@
          * @var array
          */
-        var $query;
-
-        /**
-         * Query vars, after parsing
+        var $query_vars = array();
+
+        /**
+         * 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 $request;
+
+        /**
+         * List of posts.
          *
          * @since 1.5.0
@@ -838 +783 @@
          * @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;
-
-        /**
-         * 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.
+        var $posts;
+
+        /**
+         * The amount of posts for the current query.
          *
          * @since 1.5.0
@@ -867 +792 @@
          * @var int
          */
-        var $queried_object_id;
-
-        /**
-         * Get post database query.
-         *
-         * @since 2.0.1
-         * @access public
-         * @var string
-         */
-        var $request;
-
-        /**
-         * List of posts.
-         *
-         * @since 1.5.0
+        var $post_count = 0;
+
+        /**
+         * Index of the current item in the loop.
+         *
+         * @since 1.5.0
+         * @access public
+         * @var int
+         */
+        var $current_post = -1;
+
+        /**
+         * Whether the loop has started and the caller is in the loop.
+         *
+         * @since 2.0.0
+         * @access public
+         * @var bool
+         */
+        var $in_the_loop = false;
+
+        /**
+         * The current post ID.
+         *
+         * @since 1.5.0
+         * @access public
+         * @var int
+         */
+        var $post;
+
+        /**
+         * The list of comments for current post.
+         *
+         * @since 2.2.0
          * @access public
          * @var array
          */
-        var $posts;
-
-        /**
-         * The amount of posts for the current query.
-         *
-         * @since 1.5.0
+        var $comments;
+
+        /**
+         * The amount of comments for the posts.
+         *
+         * @since 2.2.0
          * @access public
          * @var int
          */
-        var $post_count = 0;
-
-        /**
-         * Index of the current item in the loop.
-         *
-         * @since 1.5.0
+        var $comment_count = 0;
+
+        /**
+         * The index of the comment in the comment loop.
+         *
+         * @since 2.2.0
          * @access public
          * @var int
          */
-        var $current_post = -1;
-
-        /**
-         * Whether the loop has started and the caller is in the loop.
+        var $current_comment = -1;
+
+        /**
+         * 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
@@ -912 +900 @@
          * @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.
+        var $is_preview = false;
+
+        /**
+         * Set if query returns a page.
+         *
+         * @since 1.5.0
+         * @access public
+         * @var bool
+         */
+        var $is_page = false;
+
+        /**
+         * 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 $comments;
-
-        /**
-         * The amount of comments for the posts.
-         *
-         * @since 2.2.0
-         * @access public
-         * @var int
-         */
-        var $comment_count = 0;
-
-        /**
-         * The index of the comment in the comment loop.
-         *
-         * @since 2.2.0
-         * @access public
-         * @var int
-         */
-        var $current_comment = -1;
-
-        /**
-         * Current comment ID.
-         *
-         * @since 2.2.0
-         * @access public
-         * @var int
-         */
-        var $comment;
-
-        /**
-         * Amount of posts if limit clause was not used.
+         * @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 int
-         */
-        var $found_posts = 0;
-
-        /**
-         * The amount of pages.
+         * @var bool
+         */
+        var $is_singular = false;
+
+        /**
+         * 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;
-
-        /**
-         * Set if query is preview of blog.
-         *
-         * @since 2.0.0
+        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_preview = false;
-
-        /**
-         * Set if query returns a page.
-         *
-         * @since 1.5.0
-         * @access public
-         * @var bool
-         */
-        var $is_page = false;
-
-        /**
-         * 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 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 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 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;
-
-        /**
-         * Set if query is for a post type archive.
-         *
-         * @since 3.1.0
-         * @access public
-         * @var bool
-         */
-        var $is_post_type_archive = false;
-
-        /**
-         * Whether the tax query has been parsed once.
-         *
-         * @since 3.1.0
-         * @access private
-         * @var bool
-         */
-        var $parsed_tax_query = false;
 
         /**
@@ -1250 +1121 @@
         function init_query_flags() {
                 $this->is_single = false;
-                $this->is_preview = false;
                 $this->is_page = false;
                 $this->is_archive = false;
@@ -1268 +1138 @@
                 $this->is_home = false;
                 $this->is_404 = false;
-                $this->is_comments_popup = false;
                 $this->is_paged = false;
                 $this->is_admin = false;
@@ -1275 +1144 @@
                 $this->is_robots = false;
                 $this->is_posts_page = false;
-                $this->is_post_type_archive = false;
         }
 
@@ -1293 +1161 @@
                 $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();
@@ -1313 +1172 @@
          */
         function parse_query_vars() {
-                $this->parse_query();
+                $this->parse_query('');
         }
 
@@ -1360 +1219 @@
                         , 's'
                         , 'sentence'
-                        , 'fields'
                 );
 
                 foreach ( $keys as $key ) {
-                        if ( !isset($array[$key]) )
+                        if ( !isset($array[$key]))
                                 $array[$key] = '';
                 }
@@ -1372 +1230 @@
 
                 foreach ( $array_keys as $key ) {
-                        if ( !isset($array[$key]) )
+                        if ( !isset($array[$key]))
                                 $array[$key] = array();
                 }
@@ -1384 +1242 @@
          * @access public
          *
-         * @param string|array $query Optional query.
-         */
-        function parse_query( $query =  '' ) {
-                if ( ! empty( $query ) ) {
+         * @param string|array $query
+         */
+        function parse_query($query) {
+                if ( !empty($query) || !isset($this->query) ) {
                         $this->init();
-                        $this->query = $this->query_vars = wp_parse_args( $query );
-                } elseif ( ! isset( $this->query ) ) {
-                        $this->query = $this->query_vars;
+                        if ( is_array($query) )
+                                $this->query_vars = $query;
+                        else
+                                parse_str($query, $this->query_vars);
+                        $this->query = $query;
                 }
 
@@ -1437 +1297 @@
                         $this->is_page = true;
                         $this->is_single = false;
+                } elseif ( !empty($qv['s']) ) {
+                        $this->is_search = true;
                 } else {
-                // Look for archive queries.  Dates, categories, authors, search, post type archives.
-
-                        if ( !empty($qv['s']) ) {
-                                $this->is_search = true;
-                        }
+                // Look for archive queries.  Dates, categories, authors.
 
                         if ( '' !== $qv['second'] ) {
@@ -1497 +1355 @@
                         }
 
-                        $this->parsed_tax_query = false;
-                        $this->parse_tax_query( $qv );
-
-                        foreach ( $this->tax_query->queries as $tax_query ) {
-                                if ( 'IN' == $tax_query['operator'] ) {
-                                        switch ( $tax_query['taxonomy'] ) {
-                                                case 'category':
-                                                        $this->is_category = true;
-                                                        break;
-                                                case 'post_tag':
-                                                        $this->is_tag = true;
-                                                        break;
-                                                default:
-                                                        $this->is_tax = true;
+                        if ( empty($qv['cat']) || ($qv['cat'] == '0') ) {
+                                $this->is_category = false;
+                        } else {
+                                if ( strpos($qv['cat'], '-') !== false ) {
+                                        $this->is_category = false;
+                                } else {
+                                        $this->is_category = true;
+                                }
+                        }
+
+                        if ( '' != $qv['category_name'] ) {
+                                $this->is_category = 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;
                                         }
                                 }
-                        }
-                        unset( $tax_query );
-
-                        _parse_meta_query( $qv );
+                        } else {
+                                $this->is_tax = true;
+                        }
 
                         if ( empty($qv['author']) || ($qv['author'] == '0') ) {
@@ -1524 +1450 @@
                         }
 
-                        if ( '' != $qv['author_name'] )
+                        if ( '' != $qv['author_name'] ) {
                                 $this->is_author = true;
-
-                        if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-                                $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 )
+                        }
+
+                        if ( ($this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax) )
                                 $this->is_archive = true;
                 }
@@ -1571 +1492 @@
                 // Correct is_* for page_on_front and page_for_posts
                 if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
-                        $_query = wp_parse_args($this->query);
-                        // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-                        if ( isset($_query['pagename']) && '' == $_query['pagename'] )
-                                unset($_query['pagename']);
+                        $_query = wp_parse_args($query);
                         if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
                                 $this->is_page = true;
@@ -1611 +1529 @@
                 if ( !empty($qv['post_type']) ) {
                         if ( is_array($qv['post_type']) )
-                                $qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
+                                $qv['post_type'] = array_map('sanitize_user', $qv['post_type'], array(true));
                         else
-                                $qv['post_type'] = sanitize_key($qv['post_type']);
+                                $qv['post_type'] = sanitize_user($qv['post_type'], true);
                 }
 
@@ -1628 +1546 @@
                         $this->set_404();
 
-                do_action_ref_array('parse_query', array(&$this));
+                if ( !empty($query) )
+                        do_action_ref_array('parse_query', array(&$this));
         }
 
-        /*
-         * Parses various taxonomy related query vars.
-         *
-         * @access protected
-         * @since 3.1.0
-         *
-         * @param array &$q The query variables
-         */
-        function parse_tax_query( &$q ) {
-                if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
-                        $tax_query = $q['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;
+
+                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['cache_results']) ) {
+                        if ( $_wp_using_ext_object_cache )
+                                $q['cache_results'] = false;
+                        else
+                                $q['cache_results'] = true;
+                }
+
+                if ( !isset($q['update_post_term_cache']) )
+                        $q['update_post_term_cache'] = true;
+
+                if ( !isset($q['update_post_meta_cache']) )
+                        $q['update_post_meta_cache'] = true;
+
+                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 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;
+
+                // 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 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($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 {
+                                if ( 'page' != $q['post_type'] ) {
+                                        foreach ( (array)$q['post_type'] as $_post_type ) {
+                                                $ptype_obj = get_post_type_object($_post_type);
+                                                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) )
+                                        $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;
+                                        $post_type = $q['post_type'] = 'attachment';
+                                        $this->is_page = true;
+                                        $q['attachment_id'] = $reqpage;
+                                }
+                        }
+                } elseif ( '' != $q['attachment'] ) {
+                        $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
+                        $attach_paths = '/' . trim($q['attachment'], '/');
+                        $q['attachment'] = sanitize_title(basename($attach_paths));
+                        $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 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 = '') ";
+                        }
+                }
+
+                // Allow plugins to contextually add/remove/modify the search section of the database query
+                $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
+
+                // Category stuff
+
+                if ( empty($q['cat']) || ($q['cat'] == '0') ||
+                                // Bypass cat checks if fetching specific posts
+                                $this->is_singular ) {
+                        $whichcat = '';
                 } else {
-                        $tax_query = array();
-                }
-
-                if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
-                        $tax_query[] = array(
-                                'taxonomy' => $q['taxonomy'],
-                                'terms' => array( $q['term'] ),
-                                'field' => 'slug',
-                        );
-                }
-
-                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-                        if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
-                                $tax_query_defaults = array(
-                                        'taxonomy' => $taxonomy,
-                                        'field' => 'slug',
-                                );
-
-                                if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-                                        $q[$t->query_var] = wp_basename( $q[$t->query_var] );
-                                }
-
-                                $term = $q[$t->query_var];
-
-                                if ( strpos($term, '+') !== false ) {
-                                        $terms = preg_split( '/[+]+/', $term );
-                                        foreach ( $terms as $term ) {
-                                                $tax_query[] = array_merge( $tax_query_defaults, array(
-                                                        'terms' => array( $term )
-                                                ) );
-                                        }
-                                } else {
-                                        $tax_query[] = array_merge( $tax_query_defaults, array(
-                                                'terms' => preg_split( '/[,]+/', $term )
-                                        ) );
-                                }
-                        }
-                }
-
-                // Category stuff
-                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
                         $q['cat'] = ''.urldecode($q['cat']).'';
                         $q['cat'] = addslashes_gpc($q['cat']);
@@ -1696 +1888 @@
                                 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'));
                                 }
                         }
@@ -1706 +1898 @@
 
                 if ( !empty($q['category__in']) ) {
-                        $q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'category',
-                                'terms' => $q['category__in'],
-                                'field' => 'term_id',
-                                'include_children' => false
-                        );
+                        $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' ";
+                        $include_cats = "'" . implode("', '", $q['category__in']) . "'";
+                        $whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_cats) ";
                 }
 
                 if ( !empty($q['category__not_in']) ) {
-                        $q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'category',
-                                'terms' => $q['category__not_in'],
-                                'operator' => 'NOT IN',
-                                'include_children' => false
-                        );
-                }
-
-                if ( !empty($q['category__and']) ) {
-                        $q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'category',
-                                'terms' => $q['category__and'],
-                                'field' => 'term_id',
-                                'operator' => 'AND',
-                                'include_children' => false
-                        );
-                }
-
-                // Tag stuff
-                if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
+                        $cat_string = "'" . implode("', '", $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) )";
+                }
+
+                // Category stuff for nice URLs
+                if ( '' != $q['category_name'] && !$this->is_singular ) {
+                        $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'], '/');
+                        $q['category_name'] = sanitize_title(basename($cat_paths));
+
+                        $cat_paths = '/' . trim(urldecode($q['category_name']), '/');
+                        $q['category_name'] = sanitize_title(basename($cat_paths));
+                        $cat_paths = explode('/', $cat_paths);
+                        $cat_path = '';
+                        foreach ( (array) $cat_paths as $pathdir )
+                                $cat_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
+
+                        //if we don't match the entire hierarchy fallback on just matching the nicename
+                        if ( empty($reqcat) )
+                                $reqcat = get_category_by_path($q['category_name'], false);
+
+                        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']);
@@ -1756 +1964 @@
                 }
 
-                if ( !empty($q['tag_id']) ) {
-                        $q['tag_id'] = absint( $q['tag_id'] );
-                        $tax_query[] = array(
-                                'taxonomy' => 'post_tag',
-                                'terms' => $q['tag_id']
-                        );
-                }
-
-                if ( !empty($q['tag__in']) ) {
-                        $q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'post_tag',
-                                'terms' => $q['tag__in']
-                        );
+                if ( !empty($q['category__in']) || !empty($q['meta_key']) || !empty($q['tag__in']) || !empty($q['tag_slug__in']) ) {
+                        $groupby = "{$wpdb->posts}.ID";
+                }
+
+                if ( !empty($q['tag__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) ";
+                        $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
+                        $include_tags = "'" . implode("', '", $q['tag__in']) . "'";
+                        $whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) ";
+                        $reqtag = term_exists( $q['tag__in'][0], 'post_tag' );
+                        if ( !empty($reqtag) )
+                                $q['tag_id'] = $reqtag['term_id'];
+                }
+
+                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']) ) {
-                        $q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'post_tag',
-                                'terms' => $q['tag__not_in'],
-                                'operator' => 'NOT IN'
-                        );
-                }
-
-                if ( !empty($q['tag__and']) ) {
-                        $q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
-                        $tax_query[] = array(
-                                'taxonomy' => 'post_tag',
-                                'terms' => $q['tag__and'],
-                                'operator' => 'AND'
-                        );
-                }
-
-                if ( !empty($q['tag_slug__in']) ) {
-                        $q['tag_slug__in'] = array_map('sanitize_title', (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', (array) $q['tag_slug__and']);
-                        $tax_query[] = array(
-                                'taxonomy' => 'post_tag',
-                                'terms' => $q['tag_slug__and'],
-                                'field' => 'slug',
-                                'operator' => 'AND'
-                        );
-                }
-
-                $this->parsed_tax_query = true;
-
-                $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;
-
-                $q = $this->fill_query_vars($q);
-
-                // 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;
+                        $tag_string = "'" . implode("', '", $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) )";
+                }
+
+                // Tag and slug intersections.
+                $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 ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used
+
+                        if ( $item != 'category__and' ) {
+                                $reqtag = term_exists( $q[$item][0], 'post_tag' );
+                                if ( !empty($reqtag) )
+                                        $q['tag_id'] = $reqtag['term_id'];
+                        }
+
+                        if ( in_array( $item, array('tag_slug__and', 'tag_slug__in' ) ) )
+                                $taxonomy_field = 'slug';
                         else
-                                $q['cache_results'] = true;
-                }
-
-                if ( !isset($q['update_post_term_cache']) )
-                        $q['update_post_term_cache'] = true;
-
-                if ( !isset($q['update_post_meta_cache']) )
-                        $q['update_post_meta_cache'] = true;
-
-                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;
+                                $taxonomy_field = 'term_id';
+
+                        $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)";
+                        $tsql .= " WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
+                        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]);
+                        }
+                        $post_ids = $wpdb->get_col($tsql);
+
+                        if ( count($post_ids) )
+                                $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
+                        else {
+                                $whichcat = " AND 0 = 1";
+                                break;
+                        }
+                }
+
+                // Taxonomies
+                if ( $this->is_tax ) {
+                        if ( '' != $q['taxonomy'] ) {
+                                $taxonomy = $q['taxonomy'];
+                                $tt[$taxonomy] = $q['term'];
                         } 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;
-                        default:
-                                $fields = "$wpdb->posts.*";
-                }
-
-                // 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 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 {
-                                if ( 'page' != $q['post_type'] ) {
-                                        foreach ( (array)$q['post_type'] as $_post_type ) {
-                                                $ptype_obj = get_post_type_object($_post_type);
-                                                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) )
-                                        $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'] = 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 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 = esc_sql( like_escape( $term ) );
-                                $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
-                                $searchand = ' AND ';
-                        }
-                        $term = esc_sql( like_escape( $q['s'] ) );
-                        if ( empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
-                                $search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";
-
-                        if ( !empty($search) ) {
-                                $search = " AND ({$search}) ";
-                                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
-                $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;
-                                                }
+                                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+                                        if ( $t->query_var && '' != $q[$t->query_var] ) {
+                                                $tt[$taxonomy] = $q[$t->query_var];
+                                                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 );
+                        }
+
+                        $terms = get_terms($taxonomy, array('slug' => $tt[$taxonomy], 'hide_empty' => !is_taxonomy_hierarchical($taxonomy)));
+
+                        if ( is_wp_error($terms) || empty($terms) ) {
+                                $whichcat = " AND 0 ";
+                        } else {
+                                foreach ( $terms as $term ) {
+                                        $term_ids[] = $term->term_id;
+                                        if ( is_taxonomy_hierarchical($taxonomy) ) {
+                                                $children = get_term_children($term->term_id, $taxonomy);
+                                                $term_ids = array_merge($term_ids, $children);
                                         }
-                                        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 );
+                                $post_ids = get_objects_in_term($term_ids, $taxonomy);
+                                if ( !is_wp_error($post_ids) && !empty($post_ids) ) {
+                                        $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
+                                        if ( empty($post_type) ) {
+                                                $post_type = 'any';
+                                                $post_status_join = true;
+                                        } elseif ( in_array('attachment', (array)$post_type) ) {
+                                                $post_status_join = true;
                                         }
-                                        unset( $the_tag );
+                                } else {
+                                        $whichcat = " AND 0 ";
                                 }
-                                unset( $tag_query );
-                        }
-                }
-
-                if ( !empty( $this->tax_query->queries ) || !empty( $q['meta_key'] ) ) {
-                        $groupby = "{$wpdb->posts}.ID";
+                        }
                 }
 
@@ -2246 +2103 @@
                                 }
                         }
-                        $q['author_name'] = sanitize_title_for_query( $q['author_name'] );
+                        $q['author_name'] = sanitize_title($q['author_name']);
                         $q['author'] = get_user_by('slug', $q['author_name']);
                         if ( $q['author'] )
@@ -2260 +2117 @@
                 }
 
-                $where .= $search . $whichauthor . $whichmimetype;
+                $where .= $search . $whichcat . $whichauthor . $whichmimetype;
 
                 if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) )
@@ -2322 +2179 @@
                 }
 
-                if ( is_array( $post_type ) ) {
+                if ( is_array($post_type) ) {
                         $post_type_cap = 'multiple_post_type';
                 } else {
-                        $post_type_object = get_post_type_object( $post_type );
-                        if ( empty( $post_type_object ) )
+                        $post_type_object = get_post_type_object ( $post_type );
+                        if ( !empty($post_type_object) )
+                                $post_type_cap = $post_type_object->capability_type;
+                        else
                                 $post_type_cap = $post_type;
                 }
@@ -2353 +2212 @@
                 }
 
-                if ( ! empty( $post_type_object ) ) {
+                if ( !empty($post_type_object) ) {
+                        $post_type_cap = $post_type_object->capability_type;
                         $edit_cap = $post_type_object->cap->edit_post;
                         $read_cap = $post_type_object->cap->read_post;
@@ -2440 +2300 @@
                 }
 
-                if ( !empty( $q['meta_query'] ) ) {
-                        $clauses = call_user_func_array( '_get_meta_sql', array( $q['meta_query'], 'post', $wpdb->posts, 'ID', &$this) );
-                        $join .= $clauses['join'];
-                        $where .= $clauses['where'];
+                // postmeta queries
+                if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) )
+                        $join .= " JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
+                if ( ! empty($q['meta_key']) )
+                        $where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
+                if ( ! empty($q['meta_value']) ) {
+                        if ( 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']);
                 }
 
@@ -2510 +2376 @@
                 $orderby = $q['orderby'];
 
-                $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
-
                 // Apply post-paging filters on where and join.  Only plugins that
                 // manipulate paging queries should use these hooks.
@@ -2522 +2386 @@
                         $limits         = apply_filters_ref_array( 'post_limits',               array( $limits, &$this ) );
                         $fields         = apply_filters_ref_array( 'posts_fields',              array( $fields, &$this ) );
-
-                        // Filter all clauses at once, for convenience
-                        $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
-                        foreach ( $pieces as $piece )
-                                $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
                 }
 
@@ -2534 +2393 @@
                 // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
                 if ( !$q['suppress_filters'] ) {
-                        $where          = apply_filters_ref_array( 'posts_where_request',               array( $where, &$this ) );
+                        $where          = apply_filters_ref_array( 'posts_where_request',       array( $where, &$this ) );
                         $groupby        = apply_filters_ref_array( 'posts_groupby_request',             array( $groupby, &$this ) );
-                        $join           = apply_filters_ref_array( 'posts_join_request',                array( $join, &$this ) );
+                        $join           = apply_filters_ref_array( 'posts_join_request',        array( $join, &$this ) );
                         $orderby        = apply_filters_ref_array( 'posts_orderby_request',             array( $orderby, &$this ) );
                         $distinct       = apply_filters_ref_array( 'posts_distinct_request',    array( $distinct, &$this ) );
                         $fields         = apply_filters_ref_array( 'posts_fields_request',              array( $fields, &$this ) );
                         $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 ] : '';
                 }
 
@@ -2552 +2406 @@
                 if ( !empty( $orderby ) )
                         $orderby = 'ORDER BY ' . $orderby;
-
                 $found_rows = '';
                 if ( !$q['no_found_rows'] && !empty($limits) )
@@ -2561 +2414 @@
                         $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;
-                }
-
                 $this->posts = $wpdb->get_results($this->request);
-
                 // Raw results filter.  Prior to status checks.
                 if ( !$q['suppress_filters'] )
@@ -2637 +2473 @@
                 // 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['ignore_sticky_posts'] ) {
+                if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['caller_get_posts'] ) {
                         $num_posts = count($this->posts);
                         $sticky_offset = 0;
@@ -2855 +2691 @@
          * @return array List of posts.
          */
-        function &query( $query ) {
-                $this->init();
-                $this->query = $this->query_vars = wp_parse_args( $query );
+        function &query($query) {
+                $this->parse_query($query);
                 return $this->get_posts();
         }
@@ -2880 +2715 @@
                 $this->queried_object_id = 0;
 
-                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-                        $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
-
-                        $query = reset( $tax_query_in_and );
-
-                        if ( 'term_id' == $query['field'] )
-                                $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
-                        else
-                                $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
-
-                        if ( $term && ! is_wp_error($term) )  {
-                                $this->queried_object = $term;
-                                $this->queried_object_id = (int) $term->term_id;
-                        }
-                } elseif ( $this->is_post_type_archive ) {
-                        $this->queried_object = get_post_type_object( $this->get('post_type') );
+                if ( $this->is_category ) {
+                        $cat = $this->get('cat');
+                        $category = &get_category($cat);
+                        if ( is_wp_error( $category ) )
+                                return NULL;
+                        $this->queried_object = &$category;
+                        $this->queried_object_id = (int) $cat;
+                } elseif ( $this->is_tag ) {
+                        $tag_id = $this->get('tag_id');
+                        $tag = &get_term($tag_id, 'post_tag');
+                        if ( is_wp_error( $tag ) )
+                                return NULL;
+                        $this->queried_object = &$tag;
+                        $this->queried_object_id = (int) $tag_id;
+                } elseif ( $this->is_tax ) {
+                        $tax = $this->get('taxonomy');
+                        $slug = $this->get('term');
+                        $term = &get_terms($tax, array( 'slug' => $slug, 'hide_empty' => false ) );
+                        if ( is_wp_error($term) || empty($term) )
+                                return NULL;
+                        $term = $term[0];
+                        $this->queried_object = $term;
+                        $this->queried_object_id = $term->term_id;
                 } elseif ( $this->is_posts_page ) {
                         $page_for_posts = get_option('page_for_posts');
                         $this->queried_object = & get_page( $page_for_posts );
                         $this->queried_object_id = (int) $this->queried_object->ID;
-                } elseif ( $this->is_singular && !is_null($this->post) ) {
+                } elseif ( $this->is_single && !is_null($this->post) ) {
+                        $this->queried_object = $this->post;
+                        $this->queried_object_id = (int) $this->post->ID;
+                } elseif ( $this->is_page && !is_null($this->post) ) {
                         $this->queried_object = $this->post;
                         $this->queried_object_id = (int) $this->post->ID;
                 } elseif ( $this->is_author ) {
-                        $this->queried_object_id = (int) $this->get('author');
-                        $this->queried_object = get_userdata( $this->queried_object_id );
+                        $author_id = (int) $this->get('author');
+                        $author = get_userdata($author_id);
+                        $this->queried_object = $author;
+                        $this->queried_object_id = $author_id;
                 }
 
@@ -2945 +2792 @@
                 }
         }
-
-        /**
-         * 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;
-        }
 }
 
@@ -3439 +2810 @@
                 global $wpdb;
 
-                // 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';
-
-                // 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']);
+                $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'] . "'";
 
                 // 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 .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
+                        $query .= " AND YEAR(post_date) = '{$wp_query->query_vars['year']}'";
                 if ( '' != $wp_query->query_vars['monthnum'] )
-                        $query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
+                        $query .= " AND MONTH(post_date) = '{$wp_query->query_vars['monthnum']}'";
                 if ( '' != $wp_query->query_vars['day'] )
-                        $query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
+                        $query .= " AND DAYOFMONTH(post_date) = '{$wp_query->query_vars['day']}'";
 
                 $id = (int) $wpdb->get_var($query);
 
-                if ( ! $id )
+                if ( !$id )
                         return;
 
@@ -3487 +2846 @@
  */
 function setup_postdata($post) {
-        global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
+        global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
         $id = (int) $post->ID;
@@ -3493 +2852 @@
         $authordata = get_userdata($post->post_author);
 
-        $currentday = mysql2date('d.m.y', $post->post_date, false);
+        $day = mysql2date('d.m.y', $post->post_date, false);
         $currentmonth = mysql2date('m', $post->post_date, false);
         $numpages = 1;