Merge pull request #5219 from owncloud/catch_wrong_timezone

catch unknown timezone and fall-back to UTC

lib/private/log/owncloud.php

@@ -50,9 +50,13 @@ class OC_Log_Owncloud {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
 			// default to ISO8601
-			$format = OC_Config::getValue('logdateformat', 'Y-m-d H:i:s');
+			$format = OC_Config::getValue('logdateformat', 'c');
 			$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');