[Pkg-owncloud-commits] [owncloud] 93/121: properly encode groups as json, not ', ' separated

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit c4fd3dbd2aeda1bbf849956903e705bb32c8c625
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Mon Aug 18 19:47:50 2014 +0200

    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 a99c221..807cf5f 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(),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git