summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-09-03 11:24:15 +0200
committerAleksander Machniak <alec@alec.pl>2014-09-03 11:24:15 +0200
commit334bc9792789732fd5657df5abb233ad0c2da512 (patch)
tree84cf4b6f6f0ea3172f574ddf92f5c275eca9a50f /program/lib
parent57d7bc27c0588af8fdb159c88361c30d2b47a7fe (diff)
Fix merging folder annotations for folders with numeric names (only digits)
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 a66d2064d..44a79c8e6 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3952,7 +3952,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);
+ }
}
}
}