diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-08-18 19:47:50 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-08-19 11:21:04 +0200 |
| commit | c4fd3dbd2aeda1bbf849956903e705bb32c8c625 (patch) | |
| tree | aa9aa491e6db64bb892356f0fb2d1b40917479dd /settings | |
| parent | 67399901dcf1e49027fb705e65988108b6fc8418 (diff) | |
| download | nextcloud-server-c4fd3dbd2aeda1bbf849956903e705bb32c8c625.tar.gz nextcloud-server-c4fd3dbd2aeda1bbf849956903e705bb32c8c625.zip | |
properly encode groups as json, not ',' separated
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/userlist.php | 6 |
1 files 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(), |