summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-09-09 09:37:36 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-09-09 09:38:32 +0200
commit728e6ffb6928f3e69d38757e68bc5cb1a0aebc74 (patch)
treee49f041ddb7b3bfaa2de18bf38b238ee625f9e42 /program/lib
parent871a26d3285f771279e2efb0ea96baf88b952213 (diff)
Don't override argument variable when collecting results
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_imap.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 01059aad1..c45b6ea89 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3682,8 +3682,8 @@ 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)) {
- foreach ($result as $folder => $data) {
- $res[$folder] = array_merge((array) $res[$folder], $data);
+ foreach ($result as $fldr => $data) {
+ $res[$fldr] = array_merge((array) $res[$fldr], $data);
}
}
}