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 d615a4241bfea3bcf13b8ee6dd74c656892721bd..5501dd3d0ebc2621e901ce75f6a12c080aa7a8f4 100644 (file)
--- 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;
+       }
+
 }