From a8d90bd175b9d624c8c1820c26e04b7a6f8a3721 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 13 Mar 2012 04:59:07 -0400
Subject: [PATCH] - Fix counting of messages search results (on refresh when search filter is in use)
---
CHANGELOG | 4 ++++
program/include/rcube_imap.php | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 51799e8..bf0457e 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 a536e92..ed84845 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -687,8 +687,8 @@
{
$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
--
Gitblit v1.9.1