]> source.dussan.org Git - nextcloud-server.git/commit
Port of #9584
authorStephan Peijnik <speijnik@anexia-it.com>
Fri, 11 Jul 2014 05:12:04 +0000 (07:12 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Wed, 16 Jul 2014 10:23:26 +0000 (12:23 +0200)
commit4d74aa09bf7102a1104549b08c6bebe2382ec0cd
tree4f332cce50f89590ccd0f6a083e29fe0d4640398
parent7d8a8e78fa7afad6a004341b67cab19f7a4eccf8
Port of #9584

Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
lib/private/group/metadata.php
settings/users.php