WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reparse the taxonomy query if query vars change. fixes #16622 for 3.1 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17490 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2011-03-02 04:10:53 +00:00
parent 0fad424d88
commit f7d54d04e0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/query.php
View File

@ -1231,13 +1231,13 @@ class WP_Query {
var $is_post_type_archive = false; 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 * @since 3.1.0
* @access private * @access private
* @var bool
*/ */
var $parsed_tax_query = false; var $query_vars_hash = false;
/** /**
* Resets query flags to false. * Resets query flags to false.
@ -1496,7 +1496,7 @@ class WP_Query {
$this->is_date = true; $this->is_date = true;
} }
$this->parsed_tax_query = false; $this->query_vars_hash = false;
$this->parse_tax_query( $qv ); $this->parse_tax_query( $qv );
foreach ( $this->tax_query->queries as $tax_query ) { foreach ( $this->tax_query->queries as $tax_query ) {
@ -1682,7 +1682,7 @@ class WP_Query {
} }
// Category stuff // 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 && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
$q['cat'] = ''.urldecode($q['cat']).''; $q['cat'] = ''.urldecode($q['cat']).'';
$q['cat'] = addslashes_gpc($q['cat']); $q['cat'] = addslashes_gpc($q['cat']);
$cat_array = preg_split('/[,\s]+/', $q['cat']); $cat_array = preg_split('/[,\s]+/', $q['cat']);
@ -1736,7 +1736,7 @@ class WP_Query {
} }
// Tag stuff // Tag stuff
if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) { if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
if ( strpos($q['tag'], ',') !== false ) { if ( strpos($q['tag'], ',') !== false ) {
$tags = preg_split('/[,\s]+/', $q['tag']); $tags = preg_split('/[,\s]+/', $q['tag']);
foreach ( (array) $tags as $tag ) { foreach ( (array) $tags as $tag ) {
@ -1808,7 +1808,7 @@ class WP_Query {
); );
} }
$this->parsed_tax_query = true; $this->query_vars_hash = md5(serialize( $this->query_vars ) );
$this->tax_query = new WP_Tax_Query( $tax_query ); $this->tax_query = new WP_Tax_Query( $tax_query );
} }