Changeset 5999 in subversion

Timestamp:

Mar 13, 2012 4:59:07 AM (15 months ago)

Author:

alec

Message:

• Fix counting of messages search results (on refresh when search filter is in use)

Location:

branches/release-0.7

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (1 diff)

branches/release-0.7/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

branches/release-0.7/program/include/rcube_imap.php

@@ -688 +688 @@
         $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']);