diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 8084365d3..8f221a3a9 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -53,7 +53,6 @@ $labels['size'] = 'Size'; $labels['priority'] = 'Priority'; $labels['organization'] = 'Organization'; $labels['readstatus'] = 'Read status'; -$labels['focus'] = 'Focus'; $labels['listoptions'] = 'List options...'; $labels['mailboxlist'] = 'Folders'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0019d79c4..4cc578751 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -255,12 +255,16 @@ function rcmail_message_list($attrib) // save some variables for use in ajax list $_SESSION['list_attrib'] = $attrib; + // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) array_unshift($a_show_cols, 'subject'); if (!in_array('threads', $a_show_cols)) array_unshift($a_show_cols, 'threads'); + // always put focus first + array_unshift($a_show_cols, 'focus'); + $_SESSION['skin_path'] = $CONFIG['skin_path']; // set client env @@ -303,13 +307,16 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null } $mbox = $RCMAIL->storage->get_folder(); - + // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) array_unshift($a_show_cols, 'subject'); if (!in_array('threads', $a_show_cols)) array_unshift($a_show_cols, 'threads'); - + + // always put focus first + array_unshift($a_show_cols, 'focus'); + $_SESSION['list_attrib']['columns'] = $a_show_cols; // Make sure there are no duplicated columns (#1486999) |