From 43516ebef94ebcabd19e0e656cdf4f6c6d648c28 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 22 Mar 2016 17:34:20 +0100 Subject: [PATCH] Only use the user session if ownCloud is already installed When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => :bomb: --- lib/private/log/owncloud.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php index ec4af29dc84..9c106299e4c 100644 --- a/lib/private/log/owncloud.php +++ b/lib/private/log/owncloud.php @@ -90,7 +90,11 @@ class OC_Log_Owncloud { $time = $time->format($format); $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; - $userObj = \OC::$server->getUserSession()->getUser(); + if(\OC::$server->getConfig()->getSystemValue('installed', false)) { + $userObj = \OC::$server->getUserSession()->getUser(); + } else { + $userObj = null; + } $user = !is_null($userObj) ? $userObj->getUID() : '--'; $entry = compact( 'reqId',