<!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>[17246] trunk/wp-includes/query.php: Don't parse cat query var twice.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17246">17246</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-09 20:49:11 +0000 (Sun, 09 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't parse cat query var twice. Don't include children for category__* queries. Props SergeyBiryukov. see <a href="http://trac.wordpress.org/ticket/16152">#16152</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 (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-01-09 16:42:01 UTC (rev 17245)
+++ trunk/wp-includes/query.php 2011-01-09 20:49:11 UTC (rev 17246)
</span><span class="lines">@@ -1231,6 +1231,15 @@
</span><span class="cx"> var $is_post_type_archive = false;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Whether the tax query has been parsed once.
+ *
+ * @since 3.1.0
+ * @access private
+ * @var bool
+ */
+ var $parsed_tax_query = false;
+
+ /**
</ins><span class="cx"> * Resets query flags to false.
</span><span class="cx"> *
</span><span class="cx"> * The query flags are what page info WordPress was able to figure out.
</span><span class="lines">@@ -1485,6 +1494,7 @@
</span><span class="cx"> $this->is_date = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $this->parsed_tax_query = false;
</ins><span class="cx"> $this->parse_tax_query( $qv );
</span><span class="cx">
</span><span class="cx"> foreach ( $this->tax_query->queries as $tax_query ) {
</span><span class="lines">@@ -1671,7 +1681,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Category stuff
</span><del>- if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular ) {
</del><ins>+ if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
</ins><span class="cx"> $q['cat'] = ''.urldecode($q['cat']).'';
</span><span class="cx"> $q['cat'] = addslashes_gpc($q['cat']);
</span><span class="cx"> $cat_array = preg_split('/[,\s]+/', $q['cat']);
</span><span class="lines">@@ -1684,8 +1694,10 @@
</span><span class="cx"> $cat = abs($cat);
</span><span class="cx"> if ( $in ) {
</span><span class="cx"> $q['category__in'][] = $cat;
</span><ins>+ $q['category__in'] = array_merge( $q['category__in'], get_term_children($cat, 'category') );
</ins><span class="cx"> } else {
</span><span class="cx"> $q['category__not_in'][] = $cat;
</span><ins>+ $q['category__not_in'] = array_merge( $q['category__not_in'], get_term_children($cat, 'category') );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $q['cat'] = implode(',', $req_cats);
</span><span class="lines">@@ -1696,7 +1708,8 @@
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__in'],
</span><del>- 'field' => 'term_id'
</del><ins>+ 'field' => 'term_id',
+ 'include_children' => false
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1705,7 +1718,8 @@
</span><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__not_in'],
</span><del>- 'operator' => 'NOT IN'
</del><ins>+ 'operator' => 'NOT IN',
+ 'include_children' => false
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1715,7 +1729,8 @@
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__and'],
</span><span class="cx"> 'field' => 'term_id',
</span><del>- 'operator' => 'AND'
</del><ins>+ 'operator' => 'AND',
+ 'include_children' => false
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1773,6 +1788,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $this->parsed_tax_query = true;
+
</ins><span class="cx"> $this->tax_query = new WP_Tax_Query( $tax_query );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>