diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-08-24 18:08:54 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-08-24 18:20:03 +0200 |
| commit | 4db26a430b0a2fb9b5c725aef373c6b79e27f100 (patch) | |
| tree | d8113c0b2bddc53cb5393840da2f49368d5bc850 /config | |
| parent | 6e14fcf9bfb0bf3ee237dc7516655f55c8436a3a (diff) | |
Fix handling of non-default date formats (#1489294)
- remove ambiguous m/d/Y format from default config
Conflicts:
CHANGELOG
config/main.inc.php.dist
program/lib/Roundcube/rcube_utils.php
tests/Framework/Utils.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/main.inc.php.dist | 3 |
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'; |