diff options
| author | Chad Parry <github@chad.parry.org> | 2011-04-24 08:28:39 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-04-24 08:28:39 -0600 |
| commit | 26585fed03236f0f70a75959e1d3002025f4e15e (patch) | |
| tree | 33a89567f40dbbdb8affcbe76baa27b242bc6d75 /modules/gallery/config | |
| parent | 809567f12850f59bdeb47a2963f6968b99b5a201 (diff) | |
| parent | c8f90e861b866d0caa86343a6c7213e923023d39 (diff) | |
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
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 |