diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/config/locale.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
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 |