From 00d42426f2fcf7f3451d4f6745d7f9f79feaaeba Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 26 Sep 2011 03:36:24 -0400
Subject: [PATCH] Fix merging of annotation results when querying multiple attributes

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

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 3988033..0f56515 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3746,7 +3746,7 @@
             // @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;
         }

--
Gitblit v1.9.1