diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-17 16:24:09 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-17 16:24:09 +0100 |
| commit | 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 (patch) | |
| tree | 5f186f89d5d7f77592acf3aec676b48367a96d48 /program/steps/mail/check_recent.inc | |
| parent | bc66f7d6d208ac99dcec57992c4eb955570d85bc (diff) | |
| parent | 9ab34604d94270f6c1795c7dd7b615273d05db0c (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/check_recent.inc')
| -rw-r--r-- | program/steps/mail/check_recent.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index 1a1b08c60..90d17c15b 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -19,8 +19,14 @@ +-----------------------------------------------------------------------+ */ +// If there's no folder or messages list, there's nothing to update +// This can happen on 'refresh' request +if (empty($_REQUEST['_folderlist']) && empty($_REQUEST['_list'])) { + return; +} + $current = $RCMAIL->storage->get_folder(); -$check_all = !empty($_GET['_refresh']) || (bool)$RCMAIL->config->get('check_all_folders'); +$check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders'); // list of folders to check if ($check_all) { @@ -102,6 +108,4 @@ foreach ($a_mailboxes as $mbox_name) { } } -$RCMAIL->plugins->exec_hook('keep_alive', array()); - $OUTPUT->send(); |