summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-07-05 14:53:03 +0200
committerGitHub <noreply@github.com>2019-07-05 14:53:03 +0200
commit05db6481d7a2eb74085ce801a0feaac55d89d03d (patch)
tree34e0d554a6ee32a8de692c6484be7e8cc5dae58c /lib
parenteeeb5af52409466ceef780cf4eefd97f153d9920 (diff)
parent857fae288caffe25ecb9d691dfbea74f4b041339 (diff)
downloadnextcloud-server-05db6481d7a2eb74085ce801a0feaac55d89d03d.tar.gz
nextcloud-server-05db6481d7a2eb74085ce801a0feaac55d89d03d.zip
Merge pull request #16208 from nextcloud/bugfix/noid/user-share-displayname
Always set the display name for user shares
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share20/DefaultShareProvider.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 59aefd54cde..aea50dfcdb6 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -940,6 +940,10 @@ class DefaultShareProvider implements IShareProvider {
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
$share->setSharedWith($data['share_with']);
+ $user = $this->userManager->get($data['share_with']);
+ if ($user !== null) {
+ $share->setSharedWithDisplayName($user->getDisplayName());
+ }
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
$share->setSharedWith($data['share_with']);
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {