sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly use the displayname of the sharer in the notification 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/16828/head
Joas Schilling 2019-09-09 14:40:14 +07:00
parent e79ab7d0c5
commit 0fe4b717dc
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_sharing/lib/Notification/Notifier.php
Unescape Escape View File

@ -165,7 +165,12 @@ class Notifier implements INotifier {
throw new AlreadyProcessedException();
}
$subject = $l->t('You received {share} as a share from {user}');
$sharer = $this->userManager->get($share->getSharedBy());
if (!$sharer instanceof IUser) {
throw new \InvalidArgumentException('Temporary failure');
}
$subject = $l->t('You received {share} as a share by {user}');
$subjectParameters = [
'share' => [
'type' => 'highlight',
@ -174,8 +179,8 @@ class Notifier implements INotifier {
],
'user' => [
'type' => 'user',
'id' => $share->getShareOwner(),
'name' => $share->getShareOwner(),
'id' => $sharer->getUID(),
'name' => $sharer->getDisplayName(),
],
];
break;
@ -196,7 +201,12 @@ class Notifier implements INotifier {
throw new AlreadyProcessedException();
}
$subject = $l->t('You received {share} to group {group} as a share from {user}');
$sharer = $this->userManager->get($share->getSharedBy());
if (!$sharer instanceof IUser) {
throw new \InvalidArgumentException('Temporary failure');
}
$subject = $l->t('You received {share} to group {group} as a share by {user}');
$subjectParameters = [
'share' => [
'type' => 'highlight',
@ -210,8 +220,8 @@ class Notifier implements INotifier {
],
'user' => [
'type' => 'user',
'id' => $share->getShareOwner(),
'name' => $share->getShareOwner(),
'id' => $sharer->getUID(),
'name' => $sharer->getDisplayName(),
],
];
break;