From e2c557ab82119bda6bafe68b924e8cea3ea7299c Mon Sep 17 00:00:00 2001
From: Phiber2000 <phiber2000@gmx.de>
Date: Mon, 14 Mar 2016 17:59:40 +0100
Subject: [PATCH] backport of #23222 (#23225)

---
 lib/private/log/owncloud.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 5a48f9e1c6..6399d7ee58 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -76,9 +76,12 @@ class OC_Log_Owncloud {
 		} catch (Exception $e) {
 			$timezone = new DateTimeZone('UTC');
 		}
-		$time = DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""), $timezone);
+		$time = DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
 		if ($time === false) {
 			$time = new DateTime(null, $timezone);
+		} else {
+			// apply timezone if $time is created from UNIX timestamp
+			$time->setTimezone($timezone);
 		}
 		$request = \OC::$server->getRequest();
 		$reqId = $request->getId();
@@ -90,8 +93,7 @@ class OC_Log_Owncloud {
 			$url = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '--';
 			$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : '--';
 			$entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time', 'method', 'url');
-		}
-		else {
+		} else {
 			$entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time');
 		}
 		$entry = json_encode($entry);