diff options
| author | thomascube <thomas@roundcube.net> | 2010-03-17 12:24:09 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-03-17 12:24:09 +0000 |
| commit | f52c936f4d451a5d3a87d2501aa5a1701cdafde5 (patch) | |
| tree | e95611d6d47ea75e76d15ebbdea1daf4a3de83ba /program/steps/mail/search.inc | |
| parent | f4f1c442f7eb3edbb48dbcc705c6d83dcaf8e021 (diff) | |
Merged devel-threads branch (r3066:3364) back into trunk
Diffstat (limited to 'program/steps/mail/search.inc')
| -rw-r--r-- | program/steps/mail/search.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 54c765047..52469952a 100644 --- a/program/steps/mail/search.inc +++ b/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 { |