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.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'wp-includes/category.php') diff --git a/wp-includes/category.php b/wp-includes/category.php index 648ef4f..6ffb210 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -172,7 +172,7 @@ function get_category_by_path($category_path, $full_match = true, $output = OBJE foreach ($categories as $category) { $path = '/' . $leaf_path; $curcategory = $category; - while ($curcategory->category_parent != 0) { + while ( ($curcategory->category_parent != 0) && ($curcategory->category_parent != $curcategory->cat_ID) ) { $curcategory = $wpdb->get_row("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE cat_ID = '$curcategory->category_parent'"); $path = '/' . $curcategory->category_nicename . $path; } @@ -219,6 +219,9 @@ function &_get_cat_children($category_id, $categories) { $category_list = array(); foreach ( $categories as $category ) { + if ( $category->cat_ID == $category_id ) + continue; + if ( $category->category_parent == $category_id ) { $category_list[] = $category; if ( $children = _get_cat_children($category->cat_ID, $categories) ) -- cgit