summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-03-13 08:59:07 +0000
committeralecpl <alec@alec.pl>2012-03-13 08:59:07 +0000
commita8d90bd175b9d624c8c1820c26e04b7a6f8a3721 (patch)
tree5dc030f64c2a14c95ab8d6e8adf021df56d55518
parent315993ef0f7ca49205d1535a293bc0973bf68cda (diff)
- Fix counting of messages search results (on refresh when search filter is in use)
-rw-r--r--CHANGELOG4
-rw-r--r--program/include/rcube_imap.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 51799e8ff..bf0457e0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix counting of messages search results (on refresh when search filter is in use)
+
+RELEASE 0.7.2
+-------------
- Fix encoding of attachment with comma in name (#1488389)
- Fix handling of % character in IMAP protocol (#1488382)
- Fix duplicate names handling in addressbook searches (#1488375)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index a536e9235..ed84845c4 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -687,8 +687,8 @@ class rcube_imap
{
$mode = strtoupper($mode);
- // count search set
- if ($this->search_string && $mailbox == $this->mailbox && ($mode == 'ALL' || $mode == 'THREADS') && !$force) {
+ // count search set, assume search set is always up-to-date (don't check $force flag)
+ if ($this->search_string && $mailbox == $this->mailbox && ($mode == 'ALL' || $mode == 'THREADS')) {
if ($this->search_threads)
return $mode == 'ALL' ? count((array)$this->search_set['depth']) : count((array)$this->search_set['tree']);
else