summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-03-10 10:35:48 +0100
committerAleksander Machniak <alec@alec.pl>2015-03-10 10:35:48 +0100
commit10934dcd2a6bdd8253cd0784b4da189e9d3ac7c6 (patch)
tree04f7007fe6031f1579bc00add6bf030a76f4edad /program/steps
parentd12b999403b5f1dd413bc9c78d9384f5abc11d99 (diff)
Fix rows count when messages search fails (#1490266)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/search.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index d88e57568..02281e610 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -151,12 +151,14 @@ $_SESSION['search_scope'] = $scope;
// Get the headers
if (!$result->incomplete) {
$result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
- $count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
}
// Make sure we got the headers
if (!empty($result_h)) {
+ $count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+
rcmail_js_message_list($result_h, false);
+
if ($search_str) {
$OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
}
@@ -172,6 +174,7 @@ if (!empty($result_h)) {
}
// handle IMAP errors (e.g. #1486905)
else if ($err_code = $RCMAIL->storage->get_error_code()) {
+ $count = 0;
$RCMAIL->display_server_error();
}
// advice the client to re-send the (cross-folder) search request
@@ -180,6 +183,7 @@ else if ($result->incomplete) {
$OUTPUT->command('continue_search', $search_request);
}
else {
+ $count = 0;
$OUTPUT->show_message('searchnomatch', 'notice');
$OUTPUT->set_env('multifolder_listing', (bool)$result->multi);
if ($result->multi && $scope == 'all') {