diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-23 07:27:02 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-23 07:27:02 -0700 |
| commit | a1f419435c755500bbd11cb6c48a5bb31f8e6421 (patch) | |
| tree | 1e673daeb106731abbfd4f8095011538a1c31fe8 /modules/gallery/config | |
| parent | 4b01676f323fb280ebaa4c041e6894cbb464d8fe (diff) | |
| parent | 33e4a995aa844ebb523ee85a1584ab0386129f7d (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/config')
| -rw-r--r-- | modules/gallery/config/locale.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php index 0509e45f..13de9098 100644 --- a/modules/gallery/config/locale.php +++ b/modules/gallery/config/locale.php @@ -29,14 +29,10 @@ $config['language'] = array('en_US', 'English_United States'); /** - * Locale timezone. Defaults to use the server timezone. + * Locale timezone. Set in 'Advanced' settings, falling back to the server's zone. * @see http://php.net/timezones */ -$config['timezone'] = ini_get('date.timezone'); -if (empty($config['timezone'])) { - // This is a required field. Pick something as a default. - $config['timezone'] = "America/Los_Angeles"; -} +$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get()); // i18n settings |