[Pkg-owncloud-commits] [owncloud] 68/70: 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 annotated tag v6.0.5RC1
in repository owncloud.

commit a5aa04ce19142029d77b16610d27e46a08d4d17d
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Tue Aug 19 11:29:09 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 4abf54b..354b62b 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'));
 	}
 }

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