diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-12-21 14:29:56 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-12-21 14:29:56 +0100 |
| commit | 82fd09c29464539dc4480c91d6b97ed3342093a6 (patch) | |
| tree | 9239ef9501e63e3f038a4e1363c4a23a6d4c8c1d | |
| parent | 0b8a9fcaead4074d603c6a66f0c6c4c63d89dc51 (diff) | |
| download | nextcloud-server-82fd09c29464539dc4480c91d6b97ed3342093a6.tar.gz nextcloud-server-82fd09c29464539dc4480c91d6b97ed3342093a6.zip | |
don't show recurring msg when pages result was turned off
and only as debug level otherwise.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| -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 |