summaryrefslogtreecommitdiff
path: root/config/main.inc.php.dist
diff options
context:
space:
mode:
Diffstat (limited to 'config/main.inc.php.dist')
-rw-r--r--config/main.inc.php.dist3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index fe1880565..ff6a7b470 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -436,7 +436,8 @@ $rcmail_config['language'] = null;
$rcmail_config['date_format'] = 'Y-m-d';
// give this choice of date formats to the user to select from
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
+// Note: do not use ambiguous formats like m/d/Y
+$config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
// use this format for time display (date or strftime format)
$rcmail_config['time_format'] = 'H:i';