summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-29 15:47:28 -0600
committerGitHub <noreply@github.com>2017-03-29 15:47:28 -0600
commitd17678b5b2cb430a223d0053337de6fc7860d0bc (patch)
treef9a05946818d5419f6f953cb278947cd257b7038 /apps/user_ldap/lib
parent0315e2ea367796f825fe5096f3478df64927967a (diff)
parent9e2e0c4c3024fc81579842e70fd384dd8461cd11 (diff)
downloadnextcloud-server-d17678b5b2cb430a223d0053337de6fc7860d0bc.tar.gz
nextcloud-server-d17678b5b2cb430a223d0053337de6fc7860d0bc.zip
Merge pull request #4141 from nextcloud/ldap-downstream-9
Convert the group limit to match the same behaviour as the user search
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r--apps/user_ldap/lib/Command/Search.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php
index 17e506855b2..57970b1ac5d 100644
--- a/apps/user_ldap/lib/Command/Search.php
+++ b/apps/user_ldap/lib/Command/Search.php
@@ -114,6 +114,11 @@ class Search extends Command {
$proxy = new Group_Proxy($configPrefixes, $ldapWrapper);
$getMethod = 'getGroups';
$printID = false;
+ // convert the limit of groups to null. This will show all the groups available instead of
+ // nothing, and will match the same behaviour the search for users has.
+ if ($limit === 0) {
+ $limit = null;
+ }
} else {
$proxy = new User_Proxy($configPrefixes, $ldapWrapper, $this->ocConfig);
$getMethod = 'getDisplayNames';