diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-05-13 17:04:03 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-05-13 17:04:03 +0200 |
| commit | 2b4ee2235b3cbf63b1770fa91b3c31b3c742b07a (patch) | |
| tree | 9e5d6ad59dae36210109e8873fd007a70f03d0ed | |
| parent | 9e89c876013558ba5f22657e37ed1230c4b65cdf (diff) | |
| parent | b3db98dd1e360eec21f282aadf0883e85d0fca04 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | program/steps/mail/search.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index e610e9137..4aa22e14b 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -162,9 +162,11 @@ if (!empty($result_h)) { // remember last HIGHESTMODSEQ value (if supported) // we need it for flag updates in check-recent - $data = $RCMAIL->storage->folder_data($mbox_name); - if (!empty($data['HIGHESTMODSEQ'])) { - $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ']; + if ($mbox !== null) { + $data = $RCMAIL->storage->folder_data($mbox); + if (!empty($data['HIGHESTMODSEQ'])) { + $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ']; + } } } // handle IMAP errors (e.g. #1486905) @@ -189,7 +191,7 @@ $OUTPUT->set_env('search_filter', $_SESSION['search_filter']); $OUTPUT->set_env('threading', $RCMAIL->storage->get_threading()); $OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize())); -$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS')); +$OUTPUT->set_env('exists', $mbox === null ? 0 : $RCMAIL->storage->count($mbox, 'EXISTS')); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox); $OUTPUT->set_pagetitle($RCMAIL->gettext(array('name' => 'searchfor', 'vars' => array('q' => $str)))); $OUTPUT->send(); |