From 574f416076d5ea65f8720d4680135c4f50d19f29 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 3 Sep 2014 11:24:15 +0200
Subject: Fix merging folder annotations for folders with numeric names (only
 digits)

---
 program/lib/Roundcube/rcube_imap.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program')

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);
+                    }
                 }
             }
         }
-- 
cgit v1.2.3