Skip to content
Snippets Groups Projects
Commit 6ffd042a authored by Thomas Müller's avatar Thomas Müller
Browse files

fixes #20538

parent 8169e4fd
No related branches found
No related tags found
No related merge requests found
...@@ -66,13 +66,16 @@ class OC_Log_Owncloud { ...@@ -66,13 +66,16 @@ class OC_Log_Owncloud {
// default to ISO8601 // default to ISO8601
$format = $config->getValue('logdateformat', 'c'); $format = $config->getValue('logdateformat', 'c');
$logtimezone = $config->getValue( "logtimezone", 'UTC' ); $logTimeZone = $config->getValue( "logtimezone", 'UTC' );
try { try {
$timezone = new DateTimeZone($logtimezone); $timezone = new DateTimeZone($logTimeZone);
} catch (Exception $e) { } catch (Exception $e) {
$timezone = new DateTimeZone('UTC'); $timezone = new DateTimeZone('UTC');
} }
$time = DateTime::createFromFormat("U.u", microtime(true), $timezone); $time = DateTime::createFromFormat("U.u", microtime(true), $timezone);
if ($time === false) {
$time = new DateTime(null, $timezone);
}
$request = \OC::$server->getRequest(); $request = \OC::$server->getRequest();
$reqId = $request->getId(); $reqId = $request->getId();
$remoteAddr = $request->getRemoteAddress(); $remoteAddr = $request->getRemoteAddress();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment