From a57f9e2c64a8495ccb89a8b79eba6052483a0ede Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 23 Apr 2012 05:33:35 -0400
Subject: [PATCH] - Applied fixes from trunk up to r6118
---
program/include/rcube_imap.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 5e36f16..4e1d571 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1213,7 +1213,9 @@
}
// use message index sort as default sorting
else if (!$sort_field) {
+ // use search result from count() if possible
if ($this->options['skip_deleted'] && !empty($this->icache['undeleted_idx'])
+ && $this->icache['undeleted_idx']->get_parameters('ALL') !== null
&& $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
) {
$index = $this->icache['undeleted_idx'];
--
Gitblit v1.9.1