<!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>[16259] trunk/wp-includes/query.php: Allow mix of 'taxonomy' =&gt; 'foo', '
 term' =&gt; 'bar' and 'foo2' =&gt; 'bar2'.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16259">16259</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-09 16:45:51 +0000 (Tue, 09 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow mix of 'taxonomy' =&gt; 'foo', 'term' =&gt; 'bar' and 'foo2' =&gt; 'bar2'. Props filosofo. Fixes <a href="http://trac.wordpress.org/ticket/15363">#15363</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.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 (16258 => 16259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-11-09 12:27:03 UTC (rev 16258)
+++ trunk/wp-includes/query.php        2010-11-09 16:45:51 UTC (rev 16259)
</span><span class="lines">@@ -1472,33 +1472,33 @@
</span><span class="cx">                                 'field' =&gt; 'slug',
</span><span class="cx">                                 'operator' =&gt; 'IN',
</span><span class="cx">                         );
</span><del>-                } else {
-                        foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy =&gt; $t ) {
-                                if ( $t-&gt;query_var &amp;&amp; !empty( $q[$t-&gt;query_var] ) ) {
-                                        $tax_query_defaults = array(
-                                                'taxonomy' =&gt; $taxonomy,
-                                                'field' =&gt; 'slug',
-                                                'operator' =&gt; 'IN'
-                                        );
</del><ins>+                }
</ins><span class="cx"> 
</span><del>-                                        if ( $t-&gt;rewrite['hierarchical'] ) {
-                                                $q[$t-&gt;query_var] = wp_basename( $q[$t-&gt;query_var] );
-                                        }
</del><ins>+                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy =&gt; $t ) {
+                        if ( $t-&gt;query_var &amp;&amp; !empty( $q[$t-&gt;query_var] ) ) {
+                                $tax_query_defaults = array(
+                                        'taxonomy' =&gt; $taxonomy,
+                                        'field' =&gt; 'slug',
+                                        'operator' =&gt; 'IN'
+                                );
</ins><span class="cx"> 
</span><del>-                                        $term = str_replace( ' ', '+', $q[$t-&gt;query_var] );
</del><ins>+                                if ( $t-&gt;rewrite['hierarchical'] ) {
+                                        $q[$t-&gt;query_var] = wp_basename( $q[$t-&gt;query_var] );
+                                }
</ins><span class="cx"> 
</span><del>-                                        if ( strpos($term, '+') !== false ) {
-                                                $terms = preg_split( '/[+]+/', $term );
-                                                foreach ( $terms as $term ) {
-                                                        $tax_query[] = array_merge( $tax_query_defaults, array(
-                                                                'terms' =&gt; array( $term )
-                                                        ) );
-                                                }
-                                        } else {
</del><ins>+                                $term = str_replace( ' ', '+', $q[$t-&gt;query_var] );
+
+                                if ( strpos($term, '+') !== false ) {
+                                        $terms = preg_split( '/[+]+/', $term );
+                                        foreach ( $terms as $term ) {
</ins><span class="cx">                                                 $tax_query[] = array_merge( $tax_query_defaults, array(
</span><del>-                                                        'terms' =&gt; preg_split( '/[,]+/', $term )
</del><ins>+                                                        'terms' =&gt; array( $term )
</ins><span class="cx">                                                 ) );
</span><span class="cx">                                         }
</span><ins>+                                } else {
+                                        $tax_query[] = array_merge( $tax_query_defaults, array(
+                                                'terms' =&gt; preg_split( '/[,]+/', $term )
+                                        ) );
</ins><span class="cx">                                 }
</span><span class="cx">                         }
</span><span class="cx">                 }
</span></span></pre>
</div>
</div>

</body>
</html>