<!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>[16843] trunk/wp-includes: Set tax query defaults earlier,
for notice prevention and convenience.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16843">16843</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-09 17:05:40 +0000 (Thu, 09 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set tax query defaults earlier, for notice prevention and convenience. See <a href="http://trac.wordpress.org/ticket/15752">#15752</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16842 => 16843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-12-09 16:55:09 UTC (rev 16842)
+++ trunk/wp-includes/query.php 2010-12-09 17:05:40 UTC (rev 16843)
</span><span class="lines">@@ -1491,7 +1491,6 @@
</span><span class="cx"> 'taxonomy' => $q['taxonomy'],
</span><span class="cx"> 'terms' => array( $q['term'] ),
</span><span class="cx"> 'field' => 'slug',
</span><del>- 'operator' => 'IN',
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1500,7 +1499,6 @@
</span><span class="cx"> $tax_query_defaults = array(
</span><span class="cx"> 'taxonomy' => $taxonomy,
</span><span class="cx"> 'field' => 'slug',
</span><del>- 'operator' => 'IN'
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
</span><span class="lines">@@ -1550,7 +1548,6 @@
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__in'],
</span><del>- 'operator' => 'IN',
</del><span class="cx"> 'field' => 'term_id'
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="lines">@@ -1561,7 +1558,6 @@
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__not_in'],
</span><span class="cx"> 'operator' => 'NOT IN',
</span><del>- 'field' => 'term_id'
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1570,8 +1566,6 @@
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><span class="cx"> 'terms' => $qv['tag_id'],
</span><del>- 'operator' => 'IN',
- 'field' => 'term_id'
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1579,8 +1573,6 @@
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><span class="cx"> 'terms' => $q['tag__in'],
</span><del>- 'operator' => 'IN',
- 'field' => 'term_id'
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1589,11 +1581,15 @@
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><span class="cx"> 'terms' => $q['tag__not_in'],
</span><span class="cx"> 'operator' => 'NOT IN',
</span><del>- 'field' => 'term_id'
</del><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _set_tax_query_defaults( $tax_query );
+
</ins><span class="cx"> foreach ( $tax_query as $query ) {
</span><ins>+ if ( ! is_array( $query ) )
+ continue;
+
</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">@@ -1945,7 +1941,8 @@
</span><span class="cx"> // Taxonomies
</span><span class="cx"> if ( !$this->is_singular ) {
</span><span class="cx"> $this->tax_query = $this->parse_tax_query( $q );
</span><del>- if ( !empty( $this->tax_query ) ) {
</del><ins>+
+ if ( ! empty( $this->tax_query ) ) {
</ins><span class="cx"> $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
</span><span class="cx">
</span><span class="cx"> $join .= $clauses['join'];
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16842 => 16843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-09 16:55:09 UTC (rev 16842)
+++ trunk/wp-includes/taxonomy.php 2010-12-09 17:05:40 UTC (rev 16843)
</span><span class="lines">@@ -533,7 +533,9 @@
</span><span class="cx"> $where = array();
</span><span class="cx"> $i = 0;
</span><span class="cx">
</span><del>- if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
</del><ins>+ _set_tax_query_defaults( $tax_query );
+
+ if ( strtoupper( $tax_query['relation'] ) == 'OR' ) {
</ins><span class="cx"> $relation = 'OR';
</span><span class="cx"> } else {
</span><span class="cx"> $relation = 'AND';
</span><span class="lines">@@ -543,13 +545,7 @@
</span><span class="cx"> if ( ! is_array( $query ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- extract( wp_parse_args( $query, array(
- 'taxonomy' => array(),
- 'terms' => array(),
- 'include_children' => true,
- 'field' => 'term_id',
- 'operator' => 'IN',
- ) ) );
</del><ins>+ extract( $query );
</ins><span class="cx">
</span><span class="cx"> $taxonomies = (array) $taxonomy;
</span><span class="cx">
</span><span class="lines">@@ -625,6 +621,28 @@
</span><span class="cx"> return compact( 'join', 'where' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function _set_tax_query_defaults( &$tax_query ) {
+ if ( ! isset( $tax_query['relation'] ) )
+ $tax_query['relation'] = 'AND';
+
+ $defaults = array(
+ 'taxonomy' => array(),
+ 'terms' => array(),
+ 'include_children' => true,
+ 'field' => 'term_id',
+ 'operator' => 'IN',
+ );
+
+ foreach ( $tax_query as $i => $query ) {
+ if ( ! is_array( $query ) )
+ continue;
+
+ $tax_query[$i] = array_merge( $defaults, $query );
+
+ $tax_query[$i]['terms'] = (array) $tax_query[$i]['terms'];
+ }
+}
+
</ins><span class="cx"> function _transform_terms( &$terms, $taxonomies, $field, $resulting_field ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>