From c4fd3dbd2aeda1bbf849956903e705bb32c8c625 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 18 Aug 2014 19:47:50 +0200 Subject: [PATCH] properly encode groups as json, not ',' separated --- settings/ajax/userlist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(), -- 2.39.5