<!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>[15733] trunk/wp-includes/query.php:
Better way of settings tax related query flags.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15733">15733</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-06 11:13:37 +0000 (Wed, 06 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better way of settings tax related query flags. See <a href="http://trac.wordpress.org/ticket/12891">#12891</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 (15732 => 15733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-06 11:04:03 UTC (rev 15732)
+++ trunk/wp-includes/query.php 2010-10-06 11:13:37 UTC (rev 15733)
</span><span class="lines">@@ -1289,90 +1289,6 @@
</span><span class="cx"> $this->is_date = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty($qv['cat']) || ($qv['cat'] == '0') )
- $this->is_category = false;
- else
- $this->is_category = strpos($qv['cat'], '-') === false;
-
- if ( !empty($qv['category_name']) ) {
- $this->is_category = true;
- }
-
- if ( empty($qv['category__in']) ) {
- $qv['category__in'] = array();
- } else {
- $qv['category__in'] = array_map('absint', (array) $qv['category__in']);
- $this->is_category = true;
- }
-
- if ( empty($qv['category__not_in']) ) {
- $qv['category__not_in'] = array();
- } else {
- $qv['category__not_in'] = array_map('absint', (array) $qv['category__not_in']);
- }
-
- if ( empty($qv['category__and']) ) {
- $qv['category__and'] = array();
- } else {
- $qv['category__and'] = array_map('absint', (array) $qv['category__and']);
- $this->is_category = true;
- }
-
- if ( '' != $qv['tag'] )
- $this->is_tag = true;
-
- $qv['tag_id'] = absint($qv['tag_id']);
- if ( !empty($qv['tag_id']) )
- $this->is_tag = true;
-
- if ( empty($qv['tag__in']) ) {
- $qv['tag__in'] = array();
- } else {
- $qv['tag__in'] = array_map('absint', (array) $qv['tag__in']);
- $this->is_tag = true;
- }
-
- if ( empty($qv['tag__not_in']) ) {
- $qv['tag__not_in'] = array();
- } else {
- $qv['tag__not_in'] = array_map('absint', (array) $qv['tag__not_in']);
- }
-
- if ( !is_array($qv['tag__and']) || empty($qv['tag__and']) ) {
- $qv['tag__and'] = array();
- } else {
- $qv['tag__and'] = array_map('absint', (array) $qv['tag__and']);
- $this->is_tag = true;
- }
-
- if ( empty($qv['tag_slug__in']) ) {
- $qv['tag_slug__in'] = array();
- } else {
- $qv['tag_slug__in'] = array_map('sanitize_title', (array) $qv['tag_slug__in']);
- $this->is_tag = true;
- }
-
- if ( empty($qv['tag_slug__and']) ) {
- $qv['tag_slug__and'] = array();
- } else {
- $qv['tag_slug__and'] = array_map('sanitize_title', (array) $qv['tag_slug__and']);
- $this->is_tag = true;
- }
-
- if ( empty($qv['taxonomy']) || empty($qv['term']) ) {
- $this->is_tax = false;
- foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
- if ( $t->query_var && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) {
- $qv['taxonomy'] = $taxonomy;
- $qv['term'] = $qv[$t->query_var];
- $this->is_tax = true;
- break;
- }
- }
- } else {
- $this->is_tax = true;
- }
-
</del><span class="cx"> $this->parse_tax_query( $qv );
</span><span class="cx">
</span><span class="cx"> $this->parse_meta_query( $qv );
</span><span class="lines">@@ -1583,6 +1499,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->tax_query = $tax_query;
</span><ins>+
+ foreach ( $this->tax_query as $query ) {
+ if ( 'IN' == $query['operator'] ) {
+ switch ( $query['taxonomy'] ) {
+ case 'category':
+ $this->is_category = true;
+ break;
+ case 'post_tag':
+ $this->is_tag = true;
+ break;
+ default:
+ $this->is_tax = true;
+ }
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>