summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-09-08 20:25:14 +0200
committerAleksander Machniak <alec@alec.pl>2014-09-08 20:25:14 +0200
commit871a26d3285f771279e2efb0ea96baf88b952213 (patch)
treee4e592d700a29c8b8672ee01d3ff09fb60868151 /program/lib
parent1dafdff79a4da2ddc634b43814c746193fa6fbc4 (diff)
parent25207f5a650ab29e0a7b667d61a721e7e6e1f8b8 (diff)
Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_imap.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index dd5fbe498..01059aad1 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3682,7 +3682,9 @@ class rcube_imap extends rcube_storage
// @TODO: Honor MAXSIZE and DEPTH options
foreach ($queries as $attrib => $entry) {
if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) {
- $res = array_merge_recursive($res, $result);
+ foreach ($result as $folder => $data) {
+ $res[$folder] = array_merge((array) $res[$folder], $data);
+ }
}
}
}