diff options
| author | thomascube <thomas@roundcube.net> | 2010-03-17 12:24:09 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-03-17 12:24:09 +0000 |
| commit | f52c936f4d451a5d3a87d2501aa5a1701cdafde5 (patch) | |
| tree | e95611d6d47ea75e76d15ebbdea1daf4a3de83ba /program/steps/mail/mark.inc | |
| parent | f4f1c442f7eb3edbb48dbcc705c6d83dcaf8e021 (diff) | |
Merged devel-threads branch (r3066:3364) back into trunk
Diffstat (limited to 'program/steps/mail/mark.inc')
| -rw-r--r-- | program/steps/mail/mark.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index 3e0ee9ecb..c37a6e47c 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -36,7 +36,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') { // count messages before changing anything - $old_count = $IMAP->messagecount(); + $old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); $old_pages = ceil($old_count / $IMAP->page_size); $count = sizeof(explode(',', $uids)); } @@ -75,7 +75,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va $_SESSION['search'][$search_request] = $IMAP->refresh_search(); } - $msg_count = $IMAP->messagecount(); + $msg_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); $pages = ceil($msg_count / $IMAP->page_size); $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page; $remaining = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1); @@ -103,8 +103,11 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va } $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); + if ($IMAP->threading) + $count = get_input_value('_count', RCUBE_INPUT_POST); + // add new rows from next page (if any) - if (($jump_back || $nextpage_count > 0)) { + if ($count && ($jump_back || $nextpage_count > 0)) { $sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col']; $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order']; |