diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-17 12:24:09 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-17 12:24:09 +0000 |
| commit | 02eece808fde87eac07f8bcbad1ee278cb91514e (patch) | |
| tree | 221a385a7b4d5a01cec3d33543e7a85e6d093db3 /roundcubemail/program/steps/mail/search.inc | |
| parent | 7a2493bf23f7271f5ea4b9e8fd205e13014c5ca6 (diff) | |
Merged devel-threads branch (r3066:3364) back into trunk
git-svn-id: https://svn.roundcube.net/trunk@3367 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/search.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/search.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/search.inc b/roundcubemail/program/steps/mail/search.inc index 54c765047..52469952a 100644 --- a/roundcubemail/program/steps/mail/search.inc +++ b/roundcubemail/program/steps/mail/search.inc @@ -104,7 +104,7 @@ if ($search_str) // Get the headers $result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']); -$count = $IMAP->messagecount(); +$count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); // save search results in session if (!is_array($_SESSION['search'])) @@ -120,7 +120,7 @@ if (!empty($result_h)) { rcmail_js_message_list($result_h); if ($search_str) - $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count)); + $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $IMAP->messagecount(NULL, 'ALL'))); } else { |