Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

1 files changed, 10 insertions, 1 deletions

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 20de1fea..7a9af402 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -311,8 +311,9 @@ class gallery_installer {
     module::set_var("gallery", "email_header_separator", serialize("\n"));
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
+    module::set_var("gallery", "timezone", null);
 
-    module::set_version("gallery", 47);
+    module::set_version("gallery", 49);
   }
 
   static function upgrade($version) {
@@ -683,6 +684,14 @@ 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 || $version == 48) {
+      // Add configuration variable to set timezone.  Defaults to the currently
+      // used timezone (from PHP configuration).  Note that in v48 we werew
+      // setting this value incorrectly, so we're going to stomp this value for v49.
+      module::set_var("gallery", "timezone", null);
+      module::set_version("gallery", $version = 49);
+    }
   }
 
   static function uninstall() {