summaryrefslogtreecommitdiff
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:25:17 +0200
commit574f416076d5ea65f8720d4680135c4f50d19f29 (patch)
treeead9bf912c3ac3b7f4ee218e6557e331cb1bbfc6
parent3b55da7ba60bafaae5b20e0e39a3d6304001d08a (diff)
Fix merging folder annotations for folders with numeric names (only digits)
-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 83fdab9e2..c30abc0f3 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);
+ }
}
}
}