summaryrefslogtreecommitdiff
path: root/modules/gallery/config
diff options
context:
space:
mode:
authorAndy Lindeman <andy@highgroove.com>2011-04-22 18:15:17 -0400
committerAndy Lindeman <andy@highgroove.com>2011-04-22 18:15:17 -0400
commit6f916e49d5b431c2c1961a13d1a61fef8c02d628 (patch)
tree134b2907e041635915ecb4f7fa5418610b1dc653 /modules/gallery/config
parentb9a720e86bcaeab19aca81ee2af2b5c12fda1c55 (diff)
Allow timezone to be configurable
* Fixes #1637 * New advanced setting gallery/timezone * Default setting comes from PHP
Diffstat (limited to 'modules/gallery/config')
-rw-r--r--modules/gallery/config/locale.php8
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