From 5f47eda94b64b21b48ce95e329993c3ed50ef6db Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 27 Sep 2011 07:29:49 +0000
Subject: - Applied some fixes from trunk up to r5280

---
 program/include/rcube_imap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include')

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 5f476aba4..379c8c638 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3806,7 +3806,7 @@ class rcube_imap
             // @TODO: Honor MAXSIZE and DEPTH options
             foreach ($queries as $attrib => $entry)
                 if ($result = $this->conn->getAnnotation($mailbox, $entry, $attrib))
-                    $res = array_merge($res, $result);
+                    $res = array_merge_recursive($res, $result);
 
             return $res;
         }
-- 
cgit v1.2.3