Aleksander Machniak
2015-03-10 b022d7b0d43934e47329c6d024936fe02df91391
Fix rowcount if search fails (#1490266)
1 files modified
5 ■■■■ changed files
program/steps/mail/search.inc 5 ●●●● patch | view | raw | blame | history
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');
}