*/
function &query_posts($query) {
unset($GLOBALS['wp_query']);
- $GLOBALS['wp_query'] =& new WP_Query();
+ $GLOBALS['wp_query'] = new WP_Query();
return $GLOBALS['wp_query']->query($query);
}
*/
function wp_reset_query() {
unset($GLOBALS['wp_query']);
- $GLOBALS['wp_query'] =& $GLOBALS['wp_the_query'];
+ $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
wp_reset_postdata();
}
return $wp_query->is_404();
}
+/**
+ * Is the query the main query?
+ *
+ * @since 3.3.0
+ *
+ * @return bool
+ */
+function is_main_query() {
+ global $wp_query;
+ return $wp_query->is_main_query();
+}
+
/*
* The Loop. Post loop control.
*/
*/
var $tax_query;
+ /**
+ * Metadata query container
+ *
+ * @since 3.2.0
+ * @access public
+ * @var object WP_Meta_Query
+ */
+ var $meta_query = false;
+
/**
* Holds the data for a single object that is queried.
*
var $is_post_type_archive = false;
/**
- * Whether the tax query has been parsed once.
+ * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know
+ * whether we have to re-parse because something has changed
*
* @since 3.1.0
* @access private
+ */
+ var $query_vars_hash = false;
+
+ /**
+ * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
+ * via pre_get_posts hooks.
+ *
+ * @since 3.1.1
+ * @access private
+ */
+ var $query_vars_changed = true;
+
+ /**
+ * Set if post thumbnails are cached
+ *
+ * @since 3.2.0
+ * @access public
* @var bool
*/
- var $parsed_tax_query = false;
+ var $thumbnails_cached = false;
/**
* Resets query flags to false.
$this->query_vars = $this->fill_query_vars($this->query_vars);
$qv = &$this->query_vars;
+ $this->query_vars_changed = true;
if ( ! empty($qv['robots']) )
$this->is_robots = true;
$this->is_date = true;
}
- $this->parsed_tax_query = false;
+ $this->query_vars_hash = false;
$this->parse_tax_query( $qv );
foreach ( $this->tax_query->queries as $tax_query ) {
- if ( 'IN' == $tax_query['operator'] ) {
+ if ( 'NOT IN' != $tax_query['operator'] ) {
switch ( $tax_query['taxonomy'] ) {
case 'category':
$this->is_category = true;
}
unset( $tax_query );
- _parse_meta_query( $qv );
-
if ( empty($qv['author']) || ($qv['author'] == '0') ) {
$this->is_author = false;
} else {
$qv['post_type'] = sanitize_key($qv['post_type']);
}
- if ( !empty($qv['post_status']) )
- $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+ if ( ! empty( $qv['post_status'] ) ) {
+ if ( is_array( $qv['post_status'] ) )
+ $qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+ else
+ $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+ }
if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
$this->is_comment_feed = false;
if ( '404' == $qv['error'] )
$this->set_404();
+ $this->query_vars_hash = md5( serialize( $this->query_vars ) );
+ $this->query_vars_changed = false;
+
do_action_ref_array('parse_query', array(&$this));
}
}
foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+ if ( 'post_tag' == $taxonomy )
+ continue; // Handled further down in the $q['tag'] block
+
if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
$tax_query_defaults = array(
'taxonomy' => $taxonomy,
}
// Category stuff
- if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
+ if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
$q['cat'] = ''.urldecode($q['cat']).'';
$q['cat'] = addslashes_gpc($q['cat']);
$cat_array = preg_split('/[,\s]+/', $q['cat']);
}
// Tag stuff
- if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
+ if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
if ( strpos($q['tag'], ',') !== false ) {
$tags = preg_split('/[,\s]+/', $q['tag']);
foreach ( (array) $tags as $tag ) {
}
if ( !empty($q['tag_slug__in']) ) {
- $q['tag_slug__in'] = array_map('sanitize_title', (array) $q['tag_slug__in']);
+ $q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
$tax_query[] = array(
'taxonomy' => 'post_tag',
'terms' => $q['tag_slug__in'],
}
if ( !empty($q['tag_slug__and']) ) {
- $q['tag_slug__and'] = array_map('sanitize_title', (array) $q['tag_slug__and']);
+ $q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
$tax_query[] = array(
'taxonomy' => 'post_tag',
'terms' => $q['tag_slug__and'],
);
}
- $this->parsed_tax_query = true;
-
$this->tax_query = new WP_Tax_Query( $tax_query );
}
// Shorthand.
$q = &$this->query_vars;
+ // Fill again in case pre_get_posts unset some vars.
$q = $this->fill_query_vars($q);
+ // Parse meta query
+ $this->meta_query = new WP_Meta_Query();
+ $this->meta_query->parse_query_vars( $q );
+
+ // Set a flag if a pre_get_posts hook changed the query vars.
+ $hash = md5( serialize( $this->query_vars ) );
+ if ( $hash != $this->query_vars_hash ) {
+ $this->query_vars_changed = true;
+ $this->query_vars_hash = $hash;
+ }
+ unset($hash);
+
// First let's clear some variables
$distinct = '';
$whichauthor = '';
if ( intval($q['comments_popup']) )
$q['p'] = absint($q['comments_popup']);
- // If an attachment is requested by number, let it supercede any post number.
+ // If an attachment is requested by number, let it supersede any post number.
if ( $q['attachment_id'] )
$q['p'] = absint($q['attachment_id']);
$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}) ";
$search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
// Taxonomies
- $this->parse_tax_query( $q );
+ if ( !$this->is_singular ) {
+ $this->parse_tax_query( $q );
- $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+ $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
- $join .= $clauses['join'];
- $where .= $clauses['where'];
+ $join .= $clauses['join'];
+ $where .= $clauses['where'];
+ }
if ( $this->is_tax ) {
if ( empty($post_type) ) {
}
}
- if ( !empty( $this->tax_query->queries ) || !empty( $q['meta_key'] ) ) {
+ if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
$groupby = "{$wpdb->posts}.ID";
}
if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
} else {
- $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailling slash
+ $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
}
}
$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
// Order by
if ( empty($q['orderby']) ) {
- $q['orderby'] = "$wpdb->posts.post_date " . $q['order'];
+ $orderby = "$wpdb->posts.post_date " . $q['order'];
} elseif ( 'none' == $q['orderby'] ) {
- $q['orderby'] = '';
+ $orderby = '';
} else {
// Used to filter values
- $allowed_keys = array('author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
+ $allowed_keys = array('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
if ( !empty($q['meta_key']) ) {
$allowed_keys[] = $q['meta_key'];
$allowed_keys[] = 'meta_value';
}
$q['orderby'] = urldecode($q['orderby']);
$q['orderby'] = addslashes_gpc($q['orderby']);
- $orderby_array = explode(' ', $q['orderby']);
- $q['orderby'] = '';
- foreach ( $orderby_array as $i => $orderby ) {
+ $orderby_array = array();
+ foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
// Only allow certain values for safety
if ( ! in_array($orderby, $allowed_keys) )
continue;
$orderby = "$wpdb->posts.post_" . $orderby;
}
- $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
+ $orderby_array[] = $orderby;
}
+ $orderby = implode( ',', $orderby_array );
- // append ASC or DESC at the end
- if ( !empty($q['orderby']))
- $q['orderby'] .= " {$q['order']}";
-
- if ( empty($q['orderby']) )
- $q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
+ if ( empty( $orderby ) )
+ $orderby = "$wpdb->posts.post_date ".$q['order'];
+ else
+ $orderby .= " {$q['order']}";
}
if ( is_array( $post_type ) ) {
$post_type_cap = $post_type;
}
- $exclude_post_types = '';
- $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
- if ( ! empty( $in_search_post_types ) )
- $exclude_post_types .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
-
if ( 'any' == $post_type ) {
- $where .= $exclude_post_types;
+ $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
+ if ( ! empty( $in_search_post_types ) )
+ $where .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
} elseif ( ! empty( $post_type ) ) {
$read_private_cap = 'read_private_' . $post_type_cap . 's';
}
- if ( isset($q['post_status']) && '' != $q['post_status'] ) {
+ if ( ! empty( $q['post_status'] ) ) {
$statuswheres = array();
- $q_status = explode(',', $q['post_status']);
+ $q_status = $q['post_status'];
+ if ( ! is_array( $q_status ) )
+ $q_status = explode(',', $q_status);
$r_status = array();
$p_status = array();
$e_status = array();
- if ( $q['post_status'] == 'any' ) {
+ if ( in_array('any', $q_status) ) {
foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
$e_status[] = "$wpdb->posts.post_status <> '$status'";
} else {
$where .= ')';
}
- if ( !empty( $q['meta_query'] ) ) {
- $clauses = call_user_func_array( '_get_meta_sql', array( $q['meta_query'], 'post', $wpdb->posts, 'ID', &$this) );
+ if ( !empty( $this->meta_query->queries ) ) {
+ $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
$join .= $clauses['join'];
$where .= $clauses['where'];
}
$where = "AND 0";
}
- $orderby = $q['orderby'];
-
$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
// Apply post-paging filters on where and join. Only plugins that
$this->post_count = count($this->posts);
- // Sanitize before caching so it'll only get done once
- for ( $i = 0; $i < $this->post_count; $i++ ) {
- $this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
+ // Always sanitize
+ foreach ( $this->posts as $i => $post ) {
+ $this->posts[$i] = sanitize_post( $post, 'raw' );
}
if ( $q['cache_results'] )
if ( $term && ! is_wp_error($term) ) {
$this->queried_object = $term;
$this->queried_object_id = (int) $term->term_id;
+
+ if ( $this->is_category )
+ _make_cat_compat( $this->queried_object );
}
} elseif ( $this->is_post_type_archive ) {
$this->queried_object = get_post_type_object( $this->get('post_type') );
}
/**
- * PHP4 type constructor.
+ * Constructor.
*
* Sets up the WordPress query, if parameter is not empty.
*
* @param string $query URL query string.
* @return WP_Query
*/
- function WP_Query($query = '') {
+ function __construct($query = '') {
if ( ! empty($query) ) {
$this->query($query);
}
function is_404() {
return (bool) $this->is_404;
}
+
+ /**
+ * Is the query the main query?
+ *
+ * @since 3.3.0
+ *
+ * @return bool
+ */
+ function is_main_query() {
+ global $wp_the_query;
+ return $wp_the_query === $this;
+ }
}
/**
else
$post_type = 'post';
+ if ( is_array( $post_type ) ) {
+ if ( count( $post_type ) > 1 )
+ return;
+ $post_type = array_shift( $post_type );
+ }
+
// Do not attempt redirect for hierarchical post types
if ( is_post_type_hierarchical( $post_type ) )
return;
if ( !$link )
return;
- wp_redirect($link, '301'); // Permanent redirect
+ wp_redirect( $link, 301 ); // Permanent redirect
exit;
endif;
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff