sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7599 from nextcloud/quieter-debug-log 

don't show recurring log msg when paged result was turned off
pull/7670/head
Morris Jobke 2018-01-03 00:40:46 +07:00 committed by GitHub
parent 7be9b38e51 82fd09c294
commit 4d0315ceae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user_ldap/lib/Access.php
Unescape Escape View File

@ -1095,8 +1095,11 @@ class Access extends LDAPUtility implements IUserTools {
$this->pagedSearchedSuccessful = true;
}
} else {
if(!is_null($limit)) {
\OCP\Util::writeLog('user_ldap', 'Paged search was not available', \OCP\Util::INFO);
if(!is_null($limit) && intval($this->connection->ldapPagingSize) !== 0) {
\OC::$server->getLogger()->debug(
'Paged search was not available',
[ 'app' => 'user_ldap' ]
);
}
}
/* ++ Fixing RHDS searches with pages with zero results ++

2
apps/user_ldap/lib/Connection.php
Unescape Escape View File

@ -50,7 +50,7 @@ use OC\ServerNotAvailableException;
* @property boolean turnOnPasswordChange
* @property boolean hasPagedResultSupport
* @property string[] ldapBaseUsers
* @property int|string ldapPagingSize holds an integer
* @property int|null ldapPagingSize holds an integer
* @property bool|mixed|void ldapGroupMemberAssocAttr
* @property string ldapUuidUserAttribute
* @property string ldapUuidGroupAttribute