buildDataTree(): Minor improvment.

arnemorken · Nov 19, 2024 · 57e9878 · 57e9878
1 parent e96e422
commit 57e9878
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/data/mysql/anyTable.php b/data/mysql/anyTable.php
@@ -1712,27 +1712,25 @@ protected function buildDataTree(&$flatdata,$parentId=null)
           $pid = $subdata["parent_id"];
           unset($subdata["parent_id"]);
         }
-        if (is_array($subdata)) {
-          if (!isset($subdata["parent_id"]) || $subdata["parent_id"] == "")
-            $subdata["parent_id"] = null;
-          if ($subdata["parent_id"] == $parentId) {
-            $children = null;
-            if (isset($subdata[$id_name]) && $subdata[$id_name] != "")
-              $children = $this->buildDataTree($flatdata,$subdata[$id_name]);
-            if ($this->mRecurseDepth > $this->mLastNumRows + $this->mRecurseMax)
-              break; // Break recursion
-            if ($children)
-              $subdata["data"] = $children;
-            if ($parent_not_in_group && ($pid || $pid === 0))
-              $subdata["parent_id"] = $pid;
-            $retval[$idx] = $subdata;
-            unset($subdata);
-          } // if subdata
-          else {
-            if ($pid != null)
-              $subdata["parent_id"] = $pid;
-          }
-        } // if is_array
+        if (!isset($subdata["parent_id"]) || $subdata["parent_id"] == "")
+          $subdata["parent_id"] = null;
+        if ($subdata["parent_id"] == $parentId && is_array($subdata)) {
+          $children = null;
+          if (isset($subdata[$id_name]) && $subdata[$id_name] != "")
+            $children = $this->buildDataTree($flatdata,$subdata[$id_name]);
+          if ($this->mRecurseDepth > $this->mLastNumRows + $this->mRecurseMax)
+            break; // Break recursion
+          if ($children)
+            $subdata["data"] = $children;
+          if ($parent_not_in_group && ($pid || $pid === 0))
+            $subdata["parent_id"] = $pid;
+          $retval[$idx] = $subdata;
+          unset($subdata);
+        } // if subdata
+        else {
+          if ($pid != null)
+            $subdata["parent_id"] = $pid;
+        }
       } // if isset
     } // foreach
     return $retval;