diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-08-19 13:29:09 +0400 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-08-19 13:29:09 +0400 |
| commit | a5aa04ce19142029d77b16610d27e46a08d4d17d (patch) | |
| tree | f2f5b2a062c64e7977a5851b559bf9673698dc16 | |
| parent | 1e692e56e17e5530025623894307df4d4de9f803 (diff) | |
properly encode groups as json, not ',' separated
| -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 4abf54b8987..354b62b188f 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -39,8 +39,8 @@ if (OC_User::isAdminUser(OC_User::getUser())) { $users[] = array( 'name' => $user, 'displayname' => $displayname, - 'groups' => join(', ', OC_Group::getUserGroups($user)), - 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), + 'groups' => OC_Group::getUserGroups($user), + 'subadmin' => OC_SubAdmin::getSubAdminsGroups($user), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } } else { @@ -50,7 +50,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) { $users[] = array( 'name' => $user, 'displayname' => OC_User::getDisplayName($user), - 'groups' => join(', ', OC_Group::getUserGroups($user)), + 'groups' => OC_Group::getUserGroups($user), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } } |