Changeset 5760 in subversion

Timestamp:

Jan 12, 2012 9:53:11 AM (17 months ago)

Author:

alec

Message:

• Fix possible infinite loop in buildThreadData()

File:

• trunk/roundcubemail/program/include/rcube_result_thread.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_result_thread.php

@@ -554 +554 @@
     {
         foreach ((array)$data as $key => $val) {
-            $children[$key] = !empty($val);
-            $depth[$key] = $level;
-            if (!empty($val))
+            $empty          = empty($val) || !is_array($val);
+            $children[$key] = !$empty;
+            $depth[$key]    = $level;
+            if (!$empty) {
                 $this->buildThreadData($val, $depth, $children, $level + 1);
+            }
         }
     }