mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7708 from nextcloud/stable12-7599 

[stable12] don't show recurring msg when pages result was turned off
This commit is contained in:
Morris Jobke 2018-01-09 11:23:36 +01:00 committed by GitHub
parent 25ba9cbe71 0941781d1e
commit b089199141
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
View File

@ -1059,8 +1059,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
View File

@ -46,7 +46,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