Fix missing date.timezone which results in a crash on startup in I18n

code.  Fill in missing field and log it 25% of the time. Fixes #1853.

2 files changed, 14 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.");
 
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 781775b0..6225633f 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,6 +23,14 @@ class gallery_event_Core {
    * Initialization.
    */
   static function gallery_ready() {
+    if (!get_cfg_var("date.timezone")) {
+      if (!(rand() % 4)) {
+        Kohana_Log::add("error", "date.timezone setting not detected in " .
+                        get_cfg_var("cfg_file_path") . " falling back to UTC.  " .
+                        "Consult http://php.net/manual/function.get-cfg-var.php for help.");
+      }
+    }
+
     identity::load_user();
     theme::load_themes();
     locales::set_request_locale();