Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 6 insertions, 0 deletions

diff --git a/index.php b/index.php
index 6e3ee4d4..689c0770 100644
--- a/index.php
+++ b/index.php
@@ -24,6 +24,12 @@ define("IN_PRODUCTION", true);
 version_compare(PHP_VERSION, "5.2.3", "<") and
   exit("Gallery requires PHP 5.2.3 or newer (you're using " . PHP_VERSION  . ")");
 
+// PHP 5.4 requires a timezone - if one isn't set date functions aren't going to work properly.
+// We'll log this once the logging system is initialized (in the gallery_event::gallery_ready).
+if (!ini_get("date.timezone")) {
+  ini_set("date.timezone", "UTC");
+}
+
 // Gallery requires short_tags to be on
 !ini_get("short_open_tag") and exit("Gallery requires short_open_tag to be on.");