<!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>[16381] trunk/wp-includes: Set 'taxonomy' and 'term'
query vars for back-compat.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16381">16381</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-15 10:51:39 +0000 (Mon, 15 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set 'taxonomy' and 'term' query vars for back-compat. Fixes <a href="http://trac.wordpress.org/ticket/12659">#12659</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (16380 => 16381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-11-15 10:11:25 UTC (rev 16380)
+++ trunk/wp-includes/general-template.php 2010-11-15 10:51:39 UTC (rev 16381)
</span><span class="lines">@@ -549,7 +549,8 @@
</span><span class="cx">
</span><span class="cx"> // If there's a taxonomy
</span><span class="cx"> if ( is_tax() ) {
</span><del>- $tax = get_taxonomy( get_query_var('taxonomy') );
</del><ins>+ $term = get_queried_object();
+ $tax = get_taxonomy( $term->taxonomy );
</ins><span class="cx"> $title = single_term_title( $tax->labels->name . $t_sep, false );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16380 => 16381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-15 10:11:25 UTC (rev 16380)
+++ trunk/wp-includes/query.php 2010-11-15 10:51:39 UTC (rev 16381)
</span><span class="lines">@@ -1943,14 +1943,31 @@
</span><span class="cx"> $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</span><span class="cx">
</span><span class="cx"> // Back-compat
</span><del>- $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category', 'operator' => 'IN' ) );
- if ( !empty( $cat_query ) ) {
- $cat_query = reset( $cat_query );
- $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
- if ( $cat ) {
- $this->set( 'cat', $cat->term_id );
- $this->set( 'category_name', $cat->slug );
</del><ins>+ $tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) );
+ if ( !empty( $tax_query_in ) ) {
+ if ( !isset( $q['taxonomy'] ) ) {
+ foreach ( $tax_query_in as $a_tax_query ) {
+ if ( !in_array( $a_tax_query['taxonomy'], array( 'category', 'post_tag' ) ) ) {
+ $q['taxonomy'] = $a_tax_query['taxonomy'];
+ if ( 'slug' == $a_tax_query['field'] )
+ $q['term'] = $a_tax_query['terms'][0];
+ else
+ $q['term_id'] = $a_tax_query['terms'][0];
+
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><ins>+
+ $cat_query = wp_list_filter( $tax_query_in, array( 'taxonomy' => 'category' ) );
+ if ( !empty( $cat_query ) ) {
+ $cat_query = reset( $cat_query );
+ $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
+ if ( $cat ) {
+ $this->set( 'cat', $cat->term_id );
+ $this->set( 'category_name', $cat->slug );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>