summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-04-06 15:14:12 +0200
committerGitHub <noreply@github.com>2018-04-06 15:14:12 +0200
commitd45a889fe22273aab64e8a339b57da097988cd36 (patch)
treea623b126b677f04fffd4b06bc2efef740743636f /lib/private
parentb9ca1216712f9eff0471ac58d49b8ee8391a5d28 (diff)
parent5e15c76d214d6d1425bf05ceaa937371e71eaa38 (diff)
downloadnextcloud-server-d45a889fe22273aab64e8a339b57da097988cd36.tar.gz
nextcloud-server-d45a889fe22273aab64e8a339b57da097988cd36.zip
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names
[stable13] Show group display names
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Group/MetaData.php2
-rw-r--r--lib/private/Settings/Personal/PersonalInfo.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php
index d5c8b581f8b..99594301990 100644
--- a/lib/private/Group/MetaData.php
+++ b/lib/private/Group/MetaData.php
@@ -160,7 +160,7 @@ class MetaData {
private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) {
return array(
'id' => $group->getGID(),
- 'name' => $group->getGID(),
+ 'name' => $group->getDisplayName(),
'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
);
}
diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/lib/private/Settings/Personal/PersonalInfo.php
index 9e2efa6c040..05175d20a2b 100644
--- a/lib/private/Settings/Personal/PersonalInfo.php
+++ b/lib/private/Settings/Personal/PersonalInfo.php
@@ -174,7 +174,7 @@ class PersonalInfo implements ISettings {
private function getGroups(IUser $user) {
$groups = array_map(
function(IGroup $group) {
- return $group->getGID();
+ return $group->getDisplayName();
},
$this->groupManager->getUserGroups($user)
);