summaryrefslogtreecommitdiff
path: root/config/defaults.inc.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-08-24 18:08:54 +0200
committerAleksander Machniak <alec@alec.pl>2013-08-24 18:08:54 +0200
commitb32fab16efb715568f54781bcc9e14e30ce41bff (patch)
treeb3100876482e70d7cd865c3676f29b86df546ece /config/defaults.inc.php
parent9f754494e74396469ff6ceb34ece25b088756ffa (diff)
Fix handling of non-default date formats (#1489294)
- remove ambiguous m/d/Y format from default config
Diffstat (limited to 'config/defaults.inc.php')
-rw-r--r--config/defaults.inc.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index f48827eb9..54d0b1d27 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -478,7 +478,8 @@ $config['language'] = null;
$config['date_format'] = 'Y-m-d';
// give this choice of date formats to the user to select from
-$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)
$config['time_format'] = 'H:i';