From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Mon, 18 Aug 2014 17:47:50 +0000 (+0200)
Subject: properly encode groups as json, not ',' separated
X-Git-Tag: v7.0.2RC1~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c4fd3dbd2aeda1bbf849956903e705bb32c8c625;p=nextcloud-server.git

properly encode groups as json, not ',' separated
---

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index a99c221beb8..807cf5f1899 100644
--- 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(),