From 871a26d3285f771279e2efb0ea96baf88b952213 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 08 Sep 2014 14:25:14 -0400
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
---
program/lib/Roundcube/rcube_imap.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index dd5fbe4..01059aa 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3682,7 +3682,9 @@
// @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);
+ }
}
}
}
--
Gitblit v1.9.1