Changeset 92 for trunk/lib/Hierarchy.inc.php

Timestamp:

Apr 13, 2006 12:00:40 AM (18 years ago)

Author:

scdev

Message:

Q - Complete rebuild of PEdit

File:

• trunk/lib/Hierarchy.inc.php (modified) (2 diffs)

trunk/lib/Hierarchy.inc.php

@@ -677 +677 @@
      * @return array  Details of from the node table of all nodes below the
      *                specified node: (type, id, title, indent level, selected status)
-     *
-     * FIX ME: $include_curr doesn't work because the current node will break with an infinite loop.
      */
     function &getNodeList($preselected=null, $child_type=null, $child_id=null, $type_constraint=null, $include_curr=false, $order='', $_indent=0, $_return_flag=true)
@@ -709 +707 @@
             for ($i=0; $i<$num_children; $i++) {
 
-                $row = $my_children[$i];
                 // Preventing circular references.
-                if ($row['child_type'] == $child_type && $row['child_id'] == $child_id) {
-                    App::logMsg(sprintf(_("Circular reference detected: %s has itself as a parent."), $this->toStringID($row['child_type'], $row['child_id'])), LOG_ERR, __FILE__, __LINE__);
+                if ($my_children[$i]['child_type'] == $child_type && $my_children[$i]['child_id'] == $child_id && !($_return_flag && $include_curr)) {
+                    App::logMsg(sprintf(_("Circular reference detected: %s has itself as a parent."), $this->toStringID($my_children[$i]['child_type'], $my_children[$i]['child_id'])), LOG_ERR, __FILE__, __LINE__);
                     continue;
                 }
-                $row['indent'] = $_indent;
-                if (in_array($this->toStringID($row['child_type'], $row['child_id']), $preselected)) {
-                    $row['selected'] = true;
+
+                $my_children[$i]['indent'] = $_indent;
+                if (in_array($this->toStringID($my_children[$i]['child_type'], $my_children[$i]['child_id']), $preselected)) {
+                    $my_children[$i]['selected'] = true;
                 }
-                $output[] = $row;
-                unset($row);
-
-                // This is so we test if each node is a string only once. We store the result in the is_a_leaf array statically.
+                $output[] = $my_children[$i];
+
+                // Test if each node is a string only once. Store the result in the is_a_leaf array statically.
                 if (!isset($is_a_leaf[$this->toStringID($my_children[$i]['child_type'], $my_children[$i]['child_id'])])) {
                     $is_a_leaf[$this->toStringID($my_children[$i]['child_type'], $my_children[$i]['child_id'])] = $this->isLeaf($my_children[$i]['child_type'], $my_children[$i]['child_id']);