Changeset 17490
- Timestamp:
- 03/02/2011 04:10:53 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.1/wp-includes/query.php
r17456 r17490 1232 1232 1233 1233 /** 1234 * Whether the tax query has been parsed once. 1234 * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know 1235 * whether we have to re-parse because something has changed 1235 1236 * 1236 1237 * @since 3.1.0 1237 1238 * @access private 1238 * @var bool 1239 */ 1240 var $parsed_tax_query = false; 1239 */ 1240 var $query_vars_hash = false; 1241 1241 1242 1242 /** … … 1497 1497 } 1498 1498 1499 $this-> parsed_tax_query= false;1499 $this->query_vars_hash = false; 1500 1500 $this->parse_tax_query( $qv ); 1501 1501 … … 1683 1683 1684 1684 // Category stuff 1685 if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query) {1685 if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) { 1686 1686 $q['cat'] = ''.urldecode($q['cat']).''; 1687 1687 $q['cat'] = addslashes_gpc($q['cat']); … … 1737 1737 1738 1738 // Tag stuff 1739 if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query) {1739 if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) { 1740 1740 if ( strpos($q['tag'], ',') !== false ) { 1741 1741 $tags = preg_split('/[,\s]+/', $q['tag']); … … 1809 1809 } 1810 1810 1811 $this-> parsed_tax_query = true;1811 $this->query_vars_hash = md5(serialize( $this->query_vars ) ); 1812 1812 1813 1813 $this->tax_query = new WP_Tax_Query( $tax_query );
Note: See TracChangeset
for help on using the changeset viewer.