- Fix performance in array_keys_recursive()

git-svn-id: https://svn.roundcube.net/trunk@3833 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 7bb47a5f0..92785124a 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -632,8 +632,8 @@ function array_keys_recursive($array)
   if (!empty($array))
     foreach ($array as $key => $child) {
       $keys[] = $key;
-      if ($children = array_keys_recursive($child))
-        $keys = array_merge($keys, $children);
+      foreach (array_keys_recursive($child) as $val)
+        $keys[] = $val;
     }
   return $keys;
 }