aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2018-11-24 22:06:45 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2018-11-27 13:16:26 +0000
commit943f2576c578d556ee6e5fa77bfef16ab8efb515 (patch)
tree601f60a3c34d32e286e8b13d58b3ccdc96cee4de /apps
parenta2dd8d05b145a6c0009bc7620c65b94ff9279a89 (diff)
downloadnextcloud-server-943f2576c578d556ee6e5fa77bfef16ab8efb515.tar.gz
nextcloud-server-943f2576c578d556ee6e5fa77bfef16ab8efb515.zip
Fix count on string
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/Access.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index fb2582e8266..c5075a033b6 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -879,7 +879,7 @@ class Access extends LDAPUtility {
});
}
$this->batchApplyUserAttributes($recordsToUpdate);
- return $this->fetchList($ldapRecords, count($attr) > 1);
+ return $this->fetchList($ldapRecords, $this->manyAttributes($attr));
}
/**
@@ -922,7 +922,7 @@ class Access extends LDAPUtility {
* @return array
*/
public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) {
- return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), count($attr) > 1);
+ return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), $this->manyAttributes($attr));
}
/**
@@ -2011,4 +2011,17 @@ class Access extends LDAPUtility {
return $pagedSearchOK;
}
+ /**
+ * Is more than one $attr used for search?
+ *
+ * @param string|string[]|null $attr
+ * @return bool
+ */
+ private function manyAttributes($attr) {
+ if (\is_array($attr)) {
+ return \count($attr) > 1;
+ }
+ return false;
+ }
+
}