<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15765] trunk/wp-includes: Get rid of redundant ->tax_query.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15765">15765</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-09 10:19:15 +0000 (Sat, 09 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of redundant ->tax_query. See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (15764 => 15765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-10-09 09:39:16 UTC (rev 15764)
+++ trunk/wp-includes/canonical.php 2010-10-09 10:19:15 UTC (rev 15765)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
</span><span class="cx">
</span><span class="cx"> $term_count = 0;
</span><del>- foreach ( $wp_query->tax_query as $tax_query )
</del><ins>+ foreach ( $wp_query->get('tax_query') as $tax_query )
</ins><span class="cx"> $term_count += count( $tax_query['terms'] );
</span><span class="cx">
</span><span class="cx"> $obj = $wp_query->get_queried_object();
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15764 => 15765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-09 09:39:16 UTC (rev 15764)
+++ trunk/wp-includes/classes.php 2010-10-09 10:19:15 UTC (rev 15765)
</span><span class="lines">@@ -564,27 +564,6 @@
</span><span class="cx"> var $meta_query = array();
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * List of taxonomy queries
- *
- * A query is an associative array:
- * - 'taxonomy' string|array The taxonomy being queried
- * - 'terms' string|array The list of terms
- * - 'field' string (optional) Which term field is being used.
- * Possible values: 'term_id', 'slug' or 'name'
- * Default: 'slug'
- * - 'operator' string (optional)
- * Possible values: 'IN' and 'NOT IN'.
- * Default: 'IN'
- * - 'include_children' bool (optional) Whether to include child terms.
- * Default: true
- *
- * @since 3.1.0
- * @access public
- * @var array
- */
- var $tax_query = array();
-
- /*
</del><span class="cx"> * Populates the $meta_query property
</span><span class="cx"> *
</span><span class="cx"> * @access protected
</span><span class="lines">@@ -694,16 +673,26 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @uses $this->tax_query
</del><ins>+ * @param array $tax_query List of taxonomy queries. A single taxonomy query is an associative array:
+ * - 'taxonomy' string|array The taxonomy being queried
+ * - 'terms' string|array The list of terms
+ * - 'field' string (optional) Which term field is being used.
+ * Possible values: 'term_id', 'slug' or 'name'
+ * Default: 'slug'
+ * - 'operator' string (optional)
+ * Possible values: 'IN' and 'NOT IN'.
+ * Default: 'IN'
+ * - 'include_children' bool (optional) Whether to include child terms.
+ * Default: true
</ins><span class="cx"> *
</span><span class="cx"> * @param string $object_id_column
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>- function get_tax_sql( $object_id_column ) {
</del><ins>+ function get_tax_sql( $tax_query, $object_id_column ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $sql = array();
</span><del>- foreach ( $this->tax_query as $query ) {
</del><ins>+ foreach ( $tax_query as $query ) {
</ins><span class="cx"> if ( !isset( $query['include_children'] ) )
</span><span class="cx"> $query['include_children'] = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15764 => 15765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-09 09:39:16 UTC (rev 15764)
+++ trunk/wp-includes/query.php 2010-10-09 10:19:15 UTC (rev 15765)
</span><span class="lines">@@ -1081,7 +1081,6 @@
</span><span class="cx"> unset($this->posts);
</span><span class="cx"> unset($this->query);
</span><span class="cx"> $this->query_vars = array();
</span><del>- $this->tax_query = array();
</del><span class="cx"> $this->meta_query = array();
</span><span class="cx"> unset($this->queried_object);
</span><span class="cx"> unset($this->queried_object_id);
</span><span class="lines">@@ -1399,7 +1398,15 @@
</span><span class="cx"> do_action_ref_array('parse_query', array(&$this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function parse_tax_query( $q ) {
</del><ins>+ /*
+ * Populates the 'tax_query' property
+ *
+ * @access protected
+ * @since 3.1.0
+ *
+ * @param array &$q The query variables
+ */
+ function parse_tax_query( &$q ) {
</ins><span class="cx"> if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
</span><span class="cx"> $tax_query = $q['tax_query'];
</span><span class="cx"> } else {
</span><span class="lines">@@ -1502,9 +1509,9 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->tax_query = $tax_query;
</del><ins>+ $q['tax_query'] = $tax_query;
</ins><span class="cx">
</span><del>- foreach ( $this->tax_query as $query ) {
</del><ins>+ foreach ( $q['tax_query'] as $query ) {
</ins><span class="cx"> if ( 'IN' == $query['operator'] ) {
</span><span class="cx"> switch ( $query['taxonomy'] ) {
</span><span class="cx"> case 'category':
</span><span class="lines">@@ -1845,7 +1852,7 @@
</span><span class="cx"> $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
</span><span class="cx">
</span><span class="cx"> // Taxonomies
</span><del>- if ( !empty( $this->tax_query ) ) {
</del><ins>+ if ( !empty( $q['tax_query'] ) ) {
</ins><span class="cx"> if ( empty($post_type) ) {
</span><span class="cx"> $post_type = 'any';
</span><span class="cx"> $post_status_join = true;
</span><span class="lines">@@ -1853,11 +1860,11 @@
</span><span class="cx"> $post_status_join = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $where .= $this->get_tax_sql( "$wpdb->posts.ID" );
</del><ins>+ $where .= $this->get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</ins><span class="cx">
</span><span class="cx"> // Back-compat
</span><span class="cx"> if ( !empty( $ids ) ) {
</span><del>- $cat_query = wp_list_filter( $this->tax_query, array( 'taxonomy' => 'category' ) );
</del><ins>+ $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category' ) );
</ins><span class="cx"> if ( !empty( $cat_query ) ) {
</span><span class="cx"> $cat_query = reset( $cat_query );
</span><span class="cx"> $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
</span><span class="lines">@@ -2514,9 +2521,11 @@
</span><span class="cx"> $this->queried_object = NULL;
</span><span class="cx"> $this->queried_object_id = 0;
</span><span class="cx">
</span><del>- if ( $this->tax_query ) {
- $query = reset( $this->tax_query );
- if ( 'term_id' == $query['field'] )
</del><ins>+ $tax_query = $this->get('tax_query');
+
+ if ( !empty( $tax_query ) ) {
+ $query = reset( $tax_query );
+ if ( 'term_id' == $query['field'] )
</ins><span class="cx"> $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
</span><span class="cx"> else
</span><span class="cx"> $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
</span></span></pre>
</div>
</div>
</body>
</html>