diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-03-10 08:09:33 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-03-10 08:09:33 +0000 |
| commit | 71cc0cbd3cf91a02a5cf8cbe4cb2845830189d7e (patch) | |
| tree | deaa558a866a6e73b5715d4b899e32849c55f586 | |
| parent | b6e2f5153a2705a893dfc47b15826384a8b78a9c (diff) | |
Partially reverted r2339 + fix indentation
git-svn-id: https://svn.roundcube.net/trunk@2347 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/check_recent.inc | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index fba7e813c..172d57c88 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -183,7 +183,6 @@ $action_map = array( 'remove-attachment' => 'attachments.inc', 'display-attachment' => 'attachments.inc', 'upload' => 'attachments.inc', - 'check-recent' => 'check_recent.inc', ), 'addressbook' => array( diff --git a/roundcubemail/program/steps/mail/check_recent.inc b/roundcubemail/program/steps/mail/check_recent.inc index 438e97bdb..a0668537d 100644 --- a/roundcubemail/program/steps/mail/check_recent.inc +++ b/roundcubemail/program/steps/mail/check_recent.inc @@ -28,7 +28,7 @@ foreach ($a_mailboxes as $mbox_name) { // refresh saved search set if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) { $_SESSION['search'][$search_request] = $IMAP->refresh_search(); - $all_count = $IMAP->messagecount(); + $all_count = $IMAP->messagecount(); } else { $all_count = $IMAP->messagecount(NULL, 'ALL', TRUE); } @@ -62,12 +62,12 @@ foreach ($a_mailboxes as $mbox_name) { // get the headers $result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC'); // add to the list - rcmail_js_message_list($result_h, TRUE); + rcmail_js_message_list($result_h, TRUE); } } } - else if ($IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) { - $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)); + else if ($unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) { + $OUTPUT->command('set_unread_count', $mbox_name, $unseen); } } |