diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-08-27 20:56:03 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-08-27 20:56:03 -0700 |
| commit | 084c2717c0ddff6c5caa79c62abb3cdb9b4aea31 (patch) | |
| tree | af0fc03f042d11715cbbb3d137390d7df706ec3c /modules/gallery/config | |
| parent | dc21cf36b606048dc24532407d39bc8f5b4211fa (diff) | |
| parent | 246f5b59cb0e525a5ff6eaffce6b13e9af7e70b2 (diff) | |
Merge branch 'master' into bharat_dev
Diffstat (limited to 'modules/gallery/config')
| -rw-r--r-- | modules/gallery/config/locale.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php index 0509e45f..bce7fb49 100644 --- a/modules/gallery/config/locale.php +++ b/modules/gallery/config/locale.php @@ -29,13 +29,14 @@ $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"; +if (file_exists(VARPATH . "database.php")) { + $config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get()); +} else { + // Gallery3 is not installed yet -- don't make module::get_var() calls. + $config['timezone'] = date_default_timezone_get(); } // i18n settings |