diff options
| author | Chad Parry <github@chad.parry.org> | 2011-05-18 19:49:25 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-05-18 19:49:25 -0600 |
| commit | f0bfd1fef0b6d17da9a491f7c724ae53491926a2 (patch) | |
| tree | e41cb18c39b462c2ad071240e97ad2bde10693e0 /modules/gallery/config | |
| parent | 72f3fc46f6c7c9043e730063051ecfd88bf314c8 (diff) | |
| parent | db734130c5fe10408040b2326b28b102f3131271 (diff) | |
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
Conflicts:
modules/gallery/helpers/system.php
modules/gallery/tests/System_Helper_Test.php
Diffstat (limited to 'modules/gallery/config')
| -rw-r--r-- | modules/gallery/config/locale.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php index 13de9098..bce7fb49 100644 --- a/modules/gallery/config/locale.php +++ b/modules/gallery/config/locale.php @@ -32,7 +32,12 @@ $config['language'] = array('en_US', 'English_United States'); * Locale timezone. Set in 'Advanced' settings, falling back to the server's zone. * @see http://php.net/timezones */ -$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get()); +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 |