From b022d7b0d43934e47329c6d024936fe02df91391 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 10 Mar 2015 05:29:10 -0400 Subject: [PATCH] Fix rowcount if search fails (#1490266) --- program/steps/mail/search.inc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index ba8b124..4e1877e 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -126,10 +126,11 @@ // Get the headers $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); if ($search_str) { $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL'))); @@ -145,8 +146,10 @@ // handle IMAP errors (e.g. #1486905) else if ($err_code = $RCMAIL->storage->get_error_code()) { $RCMAIL->display_server_error(); + $count = 0; } else { + $count = 0; $OUTPUT->show_message('searchnomatch', 'notice'); } -- Gitblit v1.9.1