|
|
|
@ -260,8 +260,6 @@ function rcmail_message_list($attrib)
|
|
|
|
|
array_unshift($a_show_cols, 'subject');
|
|
|
|
|
if (!in_array('threads', $a_show_cols))
|
|
|
|
|
array_unshift($a_show_cols, 'threads');
|
|
|
|
|
if (!in_array('focus', $a_show_cols))
|
|
|
|
|
array_unshift($a_show_cols, 'focus');
|
|
|
|
|
|
|
|
|
|
$_SESSION['skin_path'] = $CONFIG['skin_path'];
|
|
|
|
|
|
|
|
|
@ -311,9 +309,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
|
|
|
|
|
array_unshift($a_show_cols, 'subject');
|
|
|
|
|
if (!in_array('threads', $a_show_cols))
|
|
|
|
|
array_unshift($a_show_cols, 'threads');
|
|
|
|
|
if (!in_array('focus', $a_show_cols))
|
|
|
|
|
array_unshift($a_show_cols, 'focus');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$_SESSION['list_attrib']['columns'] = $a_show_cols;
|
|
|
|
|
|
|
|
|
|
// Make sure there are no duplicated columns (#1486999)
|
|
|
|
@ -339,7 +335,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
|
|
|
|
|
if (empty($a_headers))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
|
|
|
|
|
// remove 'threads', 'attachment', 'flag', 'status', 'focus' columns, we don't need them here
|
|
|
|
|
foreach (array('threads', 'attachment', 'flag', 'status', 'priority', 'focus') as $col) {
|
|
|
|
|
if (($key = array_search($col, $a_show_cols)) !== FALSE)
|
|
|
|
|
unset($a_show_cols[$key]);
|
|
|
|
|