mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10500 from owncloud/fix_userlist_settings_ajax 

properly encode groups as json, not ',' separated
This commit is contained in:
Morris Jobke 2014-08-19 10:36:10 +02:00
parent 19610157d3 a1e8dd14a1
commit 43266526e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/ajax/userlist.php
View File

@ -58,8 +58,8 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
$users[] = array( $users[] = array(
'name' => $uid, 'name' => $uid,
'displayname' => $displayname, 'displayname' => $displayname,
'groups' => join(', ', OC_Group::getUserGroups($uid)), 'groups' => OC_Group::getUserGroups($uid),
'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)), 'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'), 'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
'storageLocation' => $user->getHome(), 'storageLocation' => $user->getHome(),
'lastLogin' => $user->getLastLogin(), 'lastLogin' => $user->getLastLogin(),
@ -82,7 +82,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
$users[] = array( $users[] = array(
'name' => $uid, 'name' => $uid,
'displayname' => $user->getDisplayName(), 'displayname' => $user->getDisplayName(),
'groups' => join(', ', $userGroups), 'groups' => $userGroups,
'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'), 'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
'storageLocation' => $user->getHome(), 'storageLocation' => $user->getHome(),
'lastLogin' => $user->getLastLogin(), 'lastLogin' => $user->getLastLogin(),