summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-09-26 07:36:24 +0000
committerthomascube <thomas@roundcube.net>2011-09-26 07:36:24 +0000
commit00d42426f2fcf7f3451d4f6745d7f9f79feaaeba (patch)
tree7076f64c816b0361fdc4853ac6479357be089b7c /program
parentfeb3783de729a5ac8ca75370ca1e359fb4116160 (diff)
Fix merging of annotation results when querying multiple attributes
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 398803343..0f5651555 100644
--- a/program/include/rcube_imap.php
+++ b/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;
}