From 5c517baf9837f002a58a352bdcc40ad9db3bc9a2 Mon Sep 17 00:00:00 2001 From: exner104 <59639860+exner104@users.noreply.github.com> Date: Wed, 8 Jan 2020 10:40:52 +0100 Subject: [PATCH] additional fix to #18730 #18733 regarding to advice from @kesselb --- apps/sharebymail/lib/ShareByMailProvider.php | 8 ++++++++ 1 file changed, 8 insertions(+) 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); -- 2.39.5