From 8b1cff507dd02d37a73f9d26bb972bdf61e86152 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 17 Apr 2012 23:17:16 +0000
Subject: Respect force flag when counting messages

git-svn-id: https://svn.roundcube.net/trunk@6094 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_imap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 3fc779b88..2e1e3ede5 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -566,8 +566,8 @@ class rcube_imap extends rcube_storage
     {
         $mode = strtoupper($mode);
 
-        // count search set, assume search set is always up-to-date (don't check $force flag)
-        if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' || $mode == 'THREADS')) {
+        // count search set
+        if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' || $mode == 'THREADS') && !$force) {
             if ($mode == 'ALL') {
                 return $this->search_set->count_messages();
             }
-- 
cgit v1.2.3