diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-08-19 10:36:10 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-08-19 10:36:10 +0200 |
| commit | 43266526e8f8169ee4c20a6d6519fd36696ec6f5 (patch) | |
| tree | 4dce1d470358d2310fd47620bbad485b2fee06e3 | |
| parent | 19610157d30462038d99ff4ce23422c224594067 (diff) | |
| parent | a1e8dd14a1d4042b905d488fdb54fb0669555fe1 (diff) | |
| download | nextcloud-server-43266526e8f8169ee4c20a6d6519fd36696ec6f5.tar.gz nextcloud-server-43266526e8f8169ee4c20a6d6519fd36696ec6f5.zip | |
Merge pull request #10500 from owncloud/fix_userlist_settings_ajax
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 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(), |