diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-11 10:57:24 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-11 10:57:24 +0200 |
| commit | e0efd8f5dc9bcdb7559c71386aa3c91c1230e8d3 (patch) | |
| tree | fae2e6c0a49aee23348e1e305d2582114cab5f6e /program/steps/mail/list.inc | |
| parent | c4a2264ae7a4f333116a558c104dbc0f98aab774 (diff) | |
Added separate From and To columns apart from smart From/To column (#1486891)
Diffstat (limited to 'program/steps/mail/list.inc')
| -rw-r--r-- | program/steps/mail/list.inc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index f3318fa18..b5d579d7d 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -34,12 +34,6 @@ if ($sort = get_input_value('_sort', RCUBE_INPUT_GET)) $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col; $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order; } -else -{ - // use session settings if set, defaults if not - $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']; -} // is there a set of columns for this request? if ($cols = get_input_value('_cols', RCUBE_INPUT_GET)) @@ -61,7 +55,7 @@ $RCMAIL->storage->folder_sync($mbox_name); if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { $search_request = md5($mbox_name.$_SESSION['search_filter']); - $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col); + $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column()); $_SESSION['search'] = $RCMAIL->storage->get_search_set(); $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); @@ -69,7 +63,7 @@ if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') // fetch message headers if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh']))) - $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, $sort_col, $sort_order); + $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order()); // update search set (possible change of threading mode) if (!empty($_REQUEST['_search']) && isset($_SESSION['search']) |