diff options
| author | alecpl <alec@alec.pl> | 2011-09-27 07:29:49 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-09-27 07:29:49 +0000 |
| commit | 5f47eda94b64b21b48ce95e329993c3ed50ef6db (patch) | |
| tree | 8dcac8522943871530cc7c00a362d507d244e8c1 /program/include | |
| parent | 075e9d5ba25ece5b7fed5470efb38272d519fa27 (diff) | |
- Applied some fixes from trunk up to r5280
Diffstat (limited to 'program/include')
| -rw-r--r-- | 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 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; } |