IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use get_queried_object() wrappers throughout. See #14015

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu
2010-10-31 11:02:17 +00:00
parent d8eee3d47f
commit e2efa78154
5 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/category-template.php
+2 -5
View File
@@ -465,8 +465,6 @@ function wp_list_categories( $args = '' ) {
$output .= $show_option_none;
}
} else {
global $wp_query;
if( !empty( $show_option_all ) )
if ( 'list' == $style )
$output .= '<li><a href="' . get_bloginfo( 'url' ) . '">' . $show_option_all . '</a></li>';
@@ -474,7 +472,7 @@ function wp_list_categories( $args = '' ) {
$output .= '<a href="' . get_bloginfo( 'url' ) . '">' . $show_option_all . '</a>';
if ( empty( $r['current_category'] ) && ( is_category() || is_tax() ) )
$r['current_category'] = $wp_query->get_queried_object_id();
$r['current_category'] = get_queried_object_id();
if ( $hierarchical )
$depth = $r['depth'];
@@ -1025,8 +1023,7 @@ function tag_description( $tag = 0 ) {
*/
function term_description( $term = 0, $taxonomy = 'post_tag' ) {
if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
global $wp_query;
$term = $wp_query->get_queried_object();
$term = get_queried_object();
$taxonomy = $term->taxonomy;
$term = $term->term_id;
}