Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Confirm that the queried term object is of the requested taxonomy in wp_list_categories. fixes #15347. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-09 01:20:38 +00:00
parent db5af22ed9
commit c3b6ef86ea
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/category-template.php
View File

@ -471,8 +471,11 @@ function wp_list_categories( $args = '' ) {
else
$output .= '<a href="' . get_bloginfo( 'url' ) . '">' . $show_option_all . '</a>';
if ( empty( $r['current_category'] ) && ( is_category() || is_tax() ) )
$r['current_category'] = get_queried_object_id();
if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
$current_term_object = get_queried_object();
if ( $r['taxonomy'] == $current_term_object->taxonomy )
$r['current_category'] = get_queried_object_id();
}
if ( $hierarchical )
$depth = $r['depth'];