diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-03 00:40:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 00:40:46 +0100 |
| commit | 4d0315ceae8cbcbe3f58a18441656cef3d46c368 (patch) | |
| tree | 3f56a805359dce8f53b61ba89e7e2b9677284731 /apps/user_ldap/lib | |
| parent | 7be9b38e510c771dc183a6309e3ad9eb08d2a4ed (diff) | |
| parent | 82fd09c29464539dc4480c91d6b97ed3342093a6 (diff) | |
| download | nextcloud-server-4d0315ceae8cbcbe3f58a18441656cef3d46c368.tar.gz nextcloud-server-4d0315ceae8cbcbe3f58a18441656cef3d46c368.zip | |
Merge pull request #7599 from nextcloud/quieter-debug-log
don't show recurring log msg when paged result was turned off
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 7 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Connection.php | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 27fda38a737..14d5b826f63 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -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 ++ diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index bde489e2710..c73a35e6bf1 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -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 |