diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
| commit | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (patch) | |
| tree | 928fc44fde692835bca9dd304ebcb17cdd710ac8 /inc/init.php | |
| parent | 4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d (diff) | |
| parent | 5d873dd4ce31c79403a01ac0e40ff148be282592 (diff) | |
| download | rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.gz rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
Conflicts:
inc/html.php
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/inc/init.php b/inc/init.php index a937b934d..3e422453d 100644 --- a/inc/init.php +++ b/inc/init.php @@ -183,11 +183,6 @@ if($conf['compression'] == 'gz' && !function_exists('gzopen')){ $conf['compression'] = 0; } -// fix dateformat for upgraders -if(strpos($conf['dformat'],'%') === false){ - $conf['dformat'] = '%Y/%m/%d %H:%M'; -} - // precalculate file creation modes init_creationmodes(); |