From 6f916e49d5b431c2c1961a13d1a61fef8c02d628 Mon Sep 17 00:00:00 2001
From: Andy Lindeman <andy@highgroove.com>
Date: Fri, 22 Apr 2011 18:15:17 -0400
Subject: Allow timezone to be configurable

* Fixes #1637
* New advanced setting gallery/timezone
* Default setting comes from PHP
---
 modules/gallery/config/locale.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/config')

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
 
-- 
cgit v1.2.3