Merge pull request #12683 from nextcloud/backport/12650/stable15

[stable15] Fix count on string

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..82947bd6868 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): bool {
+		if (\is_array($attr)) {
+			return \count($attr) > 1;
+		}
+		return false;
+	}
+
 }