From 0c1cb2fed7c584b31aa7f4df7aa565781dfe0021 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 27 Sep 2011 05:04:25 -0400
Subject: [PATCH] Fix typo; add attribute to allow html in labels
---
program/include/rcube_imap.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 03dc90a..0f56515 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -917,7 +917,6 @@
$msg_index = array_keys($msg_index);
list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
$msg_index = array_slice($msg_index, $begin, $end-$begin);
- $is_uid = true;
if ($slice)
$msg_index = array_slice($msg_index, ($this->sort_order == 'DESC' ? 0 : -$slice), $slice);
@@ -3747,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