summaryrefslogtreecommitdiffstats
path: root/apps/sharebymail
diff options
context:
space:
mode:
authorexner104 <59639860+exner104@users.noreply.github.com>2020-01-08 10:40:52 +0100
committerGitHub <noreply@github.com>2020-01-08 10:40:52 +0100
commit5c517baf9837f002a58a352bdcc40ad9db3bc9a2 (patch)
treec8a252ed136f74cdb0eb7d9c436bca83d05a3917 /apps/sharebymail
parent44eba5cdc68651cd0915891420f31af42b8de5c3 (diff)
downloadnextcloud-server-5c517baf9837f002a58a352bdcc40ad9db3bc9a2.tar.gz
nextcloud-server-5c517baf9837f002a58a352bdcc40ad9db3bc9a2.zip
additional fix to #18730 #18733
regarding to advice from @kesselb
Diffstat (limited to 'apps/sharebymail')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 6ab95b1e789..597ac196697 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -620,6 +620,14 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
$emailTemplate->addFooter();
+ $instanceName = $this->defaults->getName();
+ $senderName = $this->l->t(
+ '%1$s via %2$s',
+ [
+ $initiatorDisplayName,
+ $instanceName
+ ]
+ );
$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
$message->useTemplate($emailTemplate);