From 728e6ffb6928f3e69d38757e68bc5cb1a0aebc74 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 09 Sep 2014 03:38:32 -0400
Subject: [PATCH] Don't override argument variable when collecting results

---
 program/lib/Roundcube/rcube_imap.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 01059aa..c45b6ea 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3682,8 +3682,8 @@
             // @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);
                     }
                 }
             }

--
Gitblit v1.9.1