diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 13:52:52 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 13:52:52 +0200 |
| commit | 2b111b217c465ebf27f870140a2cdb6ea85f8180 (patch) | |
| tree | 32ca57902fad678a77cd9f3fca532f2f5d547d97 /lib | |
| parent | c0a19ecd2d4878684a135764e9cf4a175e5f591e (diff) | |
| parent | 5bb06723b0bbe3059d6bcb3a604371ab1530b492 (diff) | |
| download | nextcloud-server-2b111b217c465ebf27f870140a2cdb6ea85f8180.tar.gz nextcloud-server-2b111b217c465ebf27f870140a2cdb6ea85f8180.zip | |
Merge pull request #24851 from owncloud/ldap-static-method-log
Hack to prevent infinite loop with LDAP + logging
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Log/Owncloud.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/Log/Owncloud.php b/lib/private/Log/Owncloud.php index 0a0902b7fa1..07106be22b1 100644 --- a/lib/private/Log/Owncloud.php +++ b/lib/private/Log/Owncloud.php @@ -94,11 +94,10 @@ class Owncloud { $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; if(\OC::$server->getConfig()->getSystemValue('installed', false)) { - $userObj = \OC::$server->getUserSession()->getUser(); + $user = (\OC_User::getUser()) ? \OC_User::getUser() : '--'; } else { - $userObj = null; + $user = '--'; } - $user = !is_null($userObj) ? $userObj->getUID() : '--'; $entry = compact( 'reqId', 'remoteAddr', |