summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-07-16 11:20:35 +0200
committerVincent Petry <pvince81@owncloud.com>2014-07-16 11:20:35 +0200
commitf40554fb2e0a6b510a17dc5ccbe6d8290c74b084 (patch)
treea116f74d7ddd27d67bce0d79ad30f01e72c18506 /settings
parentcca04f35145df1a769fd340a13611ef5c6ad374a (diff)
parentb51d54a84cc91e5779ddceede3ff7ea4287c4aa9 (diff)
downloadnextcloud-server-f40554fb2e0a6b510a17dc5ccbe6d8290c74b084.tar.gz
nextcloud-server-f40554fb2e0a6b510a17dc5ccbe6d8290c74b084.zip
Merge pull request #9584 from anexia-it/bug-9583
Bugfix for issue #9583
Diffstat (limited to 'settings')
-rw-r--r--settings/users.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/settings/users.php b/settings/users.php
index 29a63a4496a..bc6c2ea7e7c 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -35,7 +35,14 @@ if($isAdmin) {
$accessibleUsers = OC_User::getDisplayNames('', 30);
$subadmins = OC_SubAdmin::getAllSubAdmins();
}else{
- $accessibleUsers = OC_Group::displayNamesInGroups($groups, '', 30);
+ /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
+ $gids = array();
+ foreach($groups as $group) {
+ if (isset($group['id'])) {
+ $gids[] = $group['id'];
+ }
+ }
+ $accessibleUsers = OC_Group::displayNamesInGroups($gids, '', 30);
$subadmins = false;
}