summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-12-16 18:58:47 +0000
committerthomascube <thomas@roundcube.net>2008-12-16 18:58:47 +0000
commit58687d011f014c03b2c5b08ce7c81372a7f5e4a5 (patch)
tree1652fbc408097540a514fb05a80e058f11cc918d
parentd859b0ca1f2bc7f046ff595fab93d17d6f6f42e4 (diff)
Be more tolerant when splitting strings + remove col that we don't have a label for
-rw-r--r--config/main.inc.php.dist2
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 8b4fbadf2..fff301751 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -117,7 +117,7 @@ $rcmail_config['smtp_log'] = TRUE;
$rcmail_config['sendmail_delay'] = 0;
// These cols are shown in the message list. Available cols are:
-// subject, from, to, cc, replyto, date, size, encoding, flag, attachment
+// subject, from, to, cc, replyto, date, size, flag, attachment
$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size', 'flag', 'attachment');
// Includes should be interpreted as PHP files
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 918e5ab28..9a92c19b7 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -136,7 +136,7 @@ function rcmail_message_list($attrib)
if (empty($attrib['columns']))
$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
else
- $a_show_cols = explode(',', strip_quotes($attrib['columns']));
+ $a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));
// store column list in a session-variable
$_SESSION['list_columns'] = $a_show_cols;