catch unknown timezone and fall-back to UTC

diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 528c6bc38beed7eeb2ed5505b5815ef1c2cf5aa1..5123ba7f17501bf981f635d8a1a021189892b944 100644 (file)
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -52,7 +52,11 @@ class OC_Log_Owncloud {
                        // default to ISO8601
                        $format = OC_Config::getValue('logdateformat', 'Y-m-d H:i:s');
                        $logtimezone=OC_Config::getValue( "logtimezone", 'UTC' );
-                       $timezone = new DateTimeZone($logtimezone);
+                       try {
+                               $timezone = new DateTimeZone($logtimezone);
+                       } catch (Exception $e) {
+                               $timezone = new DateTimeZone('UTC');
+                       }
                        $time = new DateTime(null, $timezone);
                        $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time->format($format));
                        $handle = @fopen(self::$logFile, 'a');