diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /system/config/locale.php | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system/config/locale.php')
| -rw-r--r-- | system/config/locale.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/config/locale.php b/system/config/locale.php index 3a268820..a62b4c3e 100644 --- a/system/config/locale.php +++ b/system/config/locale.php @@ -10,7 +10,8 @@ $config['language'] = array('en_US', 'English_United States'); /** - * Locale timezone. Defaults to use the server timezone. + * Locale timezone. Defaults to the timezone you have set in your php config + * This cannot be left empty, a valid timezone is required! * @see http://php.net/timezones */ -$config['timezone'] = '';
\ No newline at end of file +$config['timezone'] = ini_get('date.timezone');
\ No newline at end of file |