
<!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>[15615] trunk/wp-includes/canonical.php:

  Calculate term count using $wp_query-&gt;tax_query.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15615">15615</a></dd>

<dt>Author</dt> <dd>scribu</dd>

<dt>Date</dt> <dd>2010-09-14 11:34:40 +0000 (Tue, 14 Sep 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Calculate term count using $wp_query-&gt;tax_query. See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpincludescanonicalphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (15614 => 15615)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/canonical.php        2010-09-13 16:49:04 UTC (rev 15614)

+++ trunk/wp-includes/canonical.php        2010-09-14 11:34:40 UTC (rev 15615)

</span><span class="lines">@@ -150,9 +150,8 @@

</span><span class="cx">                 } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)

</span><span class="cx"> 

</span><span class="cx">                         $term_count = 0;

</span><del>-                        foreach ( array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in',

-                        'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and') as $key )

-                                $term_count += count($wp_query-&gt;query_vars[$key]);

</del><ins>+                        foreach ( $wp_query-&gt;tax_query as $tax_query )

+                                $term_count += count( $tax_query['terms'] );

</ins><span class="cx"> 

</span><span class="cx">                         $obj = $wp_query-&gt;get_queried_object();

</span><span class="cx"> 

</span></span></pre>

</div>

</div>


</body>

</html>