From e30516b2ee40c1c45c8f288c20a3d4372e478624 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 8 Sep 2006 10:57:32 +0000 Subject: WP Merge to #4124 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@734 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/category-template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wp-includes/category-template.php') diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 2c7db3a..346fbb6 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -47,7 +47,7 @@ function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = else $name = $parent->cat_name; - if ( $parent->category_parent ) + if ( $parent->category_parent && ($parent->category_parent != $parent->cat_ID) ) $chain .= get_category_parents($parent->category_parent, $link, $separator, $nicename); if ( $link ) @@ -169,6 +169,7 @@ function wp_dropdown_categories($args = '') { 'hide_empty' => 1, 'child_of' => 0, 'exclude' => '', 'echo' => 1, 'selected' => 0, 'hierarchical' => 0, 'name' => 'cat', 'class' => 'postform'); + $defaults['selected'] = ( is_category() ) ? get_query_var('cat') : 0; $r = array_merge($defaults, $r); $r['include_last_update_time'] = $r['show_last_update']; extract($r); -- cgit