summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-09-26 07:36:24 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-09-26 07:36:24 +0000
commit7a422a4859fed7e152b31d36d09043451b525132 (patch)
tree59d4b065c7959d7b2a8e3573b4c642b85c28579d /roundcubemail/program/include
parent4db64caea64450b2cb38161fe961f49162db7a85 (diff)
Fix merging of annotation results when querying multiple attributes
git-svn-id: https://svn.roundcube.net/trunk@5279 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
-rw-r--r--roundcubemail/program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 398803343..0f5651555 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -3746,7 +3746,7 @@ class rcube_imap
// @TODO: Honor MAXSIZE and DEPTH options
foreach ($queries as $attrib => $entry)
if ($result = $this->conn->getAnnotation($mailbox, $entry, $attrib))
- $res = array_merge($res, $result);
+ $res = array_merge_recursive($res, $result);
return $res;
}