summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-17 23:17:16 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-17 23:17:16 +0000
commit8b1cff507dd02d37a73f9d26bb972bdf61e86152 (patch)
treea6ae76805f977d7f3ccab3a5097b3eda649f705d /roundcubemail
parent2cddd7b6413fe1acd067e0947e3a3b20543d2f54 (diff)
Respect force flag when counting messages
git-svn-id: https://svn.roundcube.net/trunk@6094 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/program/include/rcube_imap.php4
1 files 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();
}