Changeset 4173

Timestamp:

09/07/06 17:42:24 (2 years ago)

Author:

ryan

Message:

Avoid infinite loop when category_parent equals cat_ID

Files:

• trunk/wp-includes/category-template.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (2 diffs)

trunk/wp-includes/category-template.php

@@ -48 +48 @@
-        $name = $parent->cat_name;
-
-
+&& ($parent->category_parent != $parent->cat_ID) 
-        $chain .= get_category_parents($parent->category_parent, $link, $separator, $nicename);
-

trunk/wp-includes/category.php

@@ -173 +173 @@
-        $path = '/' . $leaf_path;
-        $curcategory = $category;
-$curcategory->category_parent != 0
+ ($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;
@@ -220 +220 @@
-    $category_list = array();
-    foreach ( $categories as $category ) {
+        if ( $category->cat_ID == $category_id )
+            continue;
+
-        if ( $category->category_parent == $category_id ) {
-            $category_list[] = $category;