Changeset 12567

Timestamp:

02/20/08 14:15:26 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Stop recursion from some of the messed up OO we have

Files:

• util/branches/dev/jsdoc/jsdoc.module (modified) (2 diffs)

util/branches/dev/jsdoc/jsdoc.module

@@ -3000 +3000 @@
 }
 
-function _jsdoc_get_tree($environments, $parent = 0, $depth = -1) {
+function _jsdoc_get_tree($environments, $parent = 0, $depth = -1, $visited=array()) {
   static $children, $parents, $terms;
 
@@ -3033 +3033 @@
 
       if ($parents[$parent[1]]) {
-        $tree = array_merge($tree, _jsdoc_get_tree($environments, $parent[1], $depth));
+        if (in_array($parent[1], $visited)) {
+          return $tree;
+        }
+        $visited[] = $parent[1];
+        $tree = array_merge($tree, _jsdoc_get_tree($environments, $parent[1], $depth, $visited));
       }
     }