golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Calculate term count using $wp_query->tax_query. See #12891 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-09-14 11:34:40 +00:00
parent 271aa55c16
commit 692b43a71b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/canonical.php
View File

@ -150,9 +150,8 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
} elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
$term_count = 0;
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->query_vars[$key]);
foreach ( $wp_query->tax_query as $tax_query )
$term_count += count( $tax_query['terms'] );
$obj = $wp_query->get_queried_object();