Changeset 8299

Timestamp:

07/09/2008 04:57:18 AM (17 years ago)

Author:

ryan

Message:

Prevent category looping. Props tellyworth. fixes #7267

File:

• trunk/wp-includes/category-template.php (modified) (4 diffs)

trunk/wp-includes/category-template.php

@@ -1 +1 @@
 <?php
 
-function get_category_children($id, $before = '/', $after = '') {
+function get_category_children($id, $before = '/', $after = '', $visited=array()) {
     if ( 0 == $id )
         return '';
@@ -15 +15 @@
         if ( is_wp_error( $category ) )
             return $category;
-        if ( $category->parent == $id ) {
+        if ( $category->parent == $id && !in_array($category->term_id, $visited) ) {
+            $visited[] = $category->term_id;
             $chain .= $before.$category->term_id.$after;
             $chain .= get_category_children($category->term_id, $before, $after);
@@ -45 +46 @@
 }
 
-function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE){
+function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE, $visited = array()){
     $chain = '';
     $parent = &get_category($id);
@@ -56 +57 @@
         $name = $parent->cat_name;
 
-    if ( $parent->parent && ($parent->parent != $parent->term_id) )
-        $chain .= get_category_parents($parent->parent, $link, $separator, $nicename);
+    if ( $parent->parent && ($parent->parent != $parent->term_id) && !in_array($parent->parent, $visited) ) {
+        $visited[] = $parent->parent;
+        $chain .= get_category_parents($parent->parent, $link, $separator, $nicename, $visited);
+    }
 
     if ( $link )