From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sat, 24 Nov 2018 21:06:45 +0000 (+0100)
Subject: Fix count on string
X-Git-Tag: v14.0.5RC1~77^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=375ece362dd971b2781e77eafad1aeb180a6dba0;p=nextcloud-server.git

Fix count on string

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index d615a4241bf..5501dd3d0eb 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -880,7 +880,7 @@ class Access extends LDAPUtility implements IUserTools {
 			});
 		}
 		$this->batchApplyUserAttributes($recordsToUpdate);
-		return $this->fetchList($ldapRecords, count($attr) > 1);
+		return $this->fetchList($ldapRecords, $this->manyAttributes($attr));
 	}
 
 	/**
@@ -923,7 +923,7 @@ class Access extends LDAPUtility implements IUserTools {
 	 * @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));
 	}
 
 	/**
@@ -2016,4 +2016,17 @@ class Access extends LDAPUtility implements IUserTools {
 		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;
+	}
+
 }