Merge branch 'time-zone-improvements' of https://github.com/alindeman/gallery3 into alindeman-time-zone-improvements

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
 

modules/gallery/helpers/gallery_installer.php

@@ -683,6 +683,13 @@ class gallery_installer {
       module::set_var("gallery", "apple_touch_icon_url", "lib/images/apple-touch-icon.png");
       module::set_version("gallery", $version = 47);
     }
+
+    if ($version == 47) {
+      // Add configuration variable to set timezone.  Defaults to the currently
+      // used timezone (from PHP configuration).
+      module::set_var("gallery", "timezone", Kohana::config('locale.timezone'));
+      module::set_version("gallery", $version = 48);
+    }
   }
 
   static function uninstall() {

modules/gallery/module.info

@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 47
+version = 48