Merge pull request #24851 from owncloud/ldap-static-method-log
Hack to prevent infinite loop with LDAP + logging
This commit is contained in:
commit
2b111b217c
|
@ -94,11 +94,10 @@ class Owncloud {
|
||||||
$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
|
$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
|
||||||
$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
|
$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
|
||||||
if(\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
if(\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
||||||
$userObj = \OC::$server->getUserSession()->getUser();
|
$user = (\OC_User::getUser()) ? \OC_User::getUser() : '--';
|
||||||
} else {
|
} else {
|
||||||
$userObj = null;
|
$user = '--';
|
||||||
}
|
}
|
||||||
$user = !is_null($userObj) ? $userObj->getUID() : '--';
|
|
||||||
$entry = compact(
|
$entry = compact(
|
||||||
'reqId',
|
'reqId',
|
||||||
'remoteAddr',
|
'remoteAddr',
|
||||||
|
|
Loading…
Reference in New Issue