<!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>[15860] trunk/wp-includes: Fix 'taxonomy' and 'term' query var logic.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15860">15860</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-20 12:07:23 +0000 (Wed, 20 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix 'taxonomy' and 'term' query var logic. See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15859 => 15860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-20 11:56:04 UTC (rev 15859)
+++ trunk/wp-includes/classes.php 2010-10-20 12:07:23 UTC (rev 15860)
</span><span class="lines">@@ -281,10 +281,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset( $taxonomy_query_vars[$wpvar] ) ) {
- $this->query_vars['taxonomy'] = $taxonomy_query_vars[$wpvar];
- $this->query_vars['term'] = $this->query_vars[$wpvar];
- } elseif ( isset($post_type_query_vars[$wpvar] ) ) {
</del><ins>+ if ( isset($post_type_query_vars[$wpvar] ) ) {
</ins><span class="cx"> $this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
</span><span class="cx"> $this->query_vars['name'] = $this->query_vars[$wpvar];
</span><span class="cx"> }
</span><span class="lines">@@ -1904,4 +1901,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15859 => 15860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-20 11:56:04 UTC (rev 15859)
+++ trunk/wp-includes/query.php 2010-10-20 12:07:23 UTC (rev 15860)
</span><span class="lines">@@ -1452,37 +1452,38 @@
</span><span class="cx"> if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => $q['taxonomy'],
</span><del>- 'terms' => $q['term'],
</del><ins>+ 'terms' => array( $q['term'] ),
+ 'field' => 'slug',
</ins><span class="cx"> );
</span><del>- }
</del><ins>+ } else {
+ foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+ if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+ $tax_query_defaults = array(
+ 'taxonomy' => $taxonomy,
+ 'field' => 'slug',
+ 'operator' => 'IN'
+ );
</ins><span class="cx">
</span><del>- foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
- if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
- $tax_query_defaults = array(
- 'taxonomy' => $taxonomy,
- 'field' => 'slug',
- 'operator' => 'IN'
- );
</del><ins>+ if ( $t->rewrite['hierarchical'] ) {
+ $q[$t->query_var] = basename($q[$t->query_var]);
+ if ( $taxonomy == $q['taxonomy'] )
+ $q['term'] = basename($q['term']);
+ }
</ins><span class="cx">
</span><del>- if ( $t->rewrite['hierarchical'] ) {
- $q[$t->query_var] = basename($q[$t->query_var]);
- if ( $taxonomy == $q['taxonomy'] )
- $q['term'] = basename($q['term']);
- }
</del><ins>+ $term = $q[$t->query_var];
</ins><span class="cx">
</span><del>- $term = $q[$t->query_var];
-
- if ( strpos($term, '+') !== false ) {
- $terms = preg_split( '/[+\s]+/', $term );
- foreach ( $terms as $term ) {
</del><ins>+ if ( strpos($term, '+') !== false ) {
+ $terms = preg_split( '/[+\s]+/', $term );
+ foreach ( $terms as $term ) {
+ $tax_query[] = array_merge( $tax_query_defaults, array(
+ 'terms' => array( $term )
+ ) );
+ }
+ } else {
</ins><span class="cx"> $tax_query[] = array_merge( $tax_query_defaults, array(
</span><del>- 'terms' => array( $term )
</del><ins>+ 'terms' => preg_split('/[,\s]+/', $term)
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><del>- } else {
- $tax_query[] = array_merge( $tax_query_defaults, array(
- 'terms' => preg_split('/[,\s]+/', $term)
- ) );
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>