properly encode groups as json, not ',' separated

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index a99c221beb841c20fbddd1658f18d03261f29f35..807cf5f1899610ad74492e6a8161ee48534d168d 100644 (file)
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -58,8 +58,8 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
                $users[] = array(
                        'name' => $uid,
                        'displayname' => $displayname,
-                       'groups' => join(', ', OC_Group::getUserGroups($uid)),
-                       'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)),
+                       'groups' => OC_Group::getUserGroups($uid),
+                       'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
                        'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
                        'storageLocation' => $user->getHome(),
                        'lastLogin' => $user->getLastLogin(),
@@ -82,7 +82,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
                $users[] = array(
                        'name' => $uid,
                        'displayname' => $user->getDisplayName(),
-                       'groups' => join(', ', $userGroups),
+                       'groups' => $userGroups,
                        'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
                        'storageLocation' => $user->getHome(),
                        'lastLogin' => $user->getLastLogin(),