]> source.dussan.org Git - nextcloud-server.git/commitdiff
additional fix to #18730 #18733 18733/head
authorexner104 <59639860+exner104@users.noreply.github.com>
Wed, 8 Jan 2020 09:40:52 +0000 (10:40 +0100)
committerGitHub <noreply@github.com>
Wed, 8 Jan 2020 09:40:52 +0000 (10:40 +0100)
regarding to advice from @kesselb

apps/sharebymail/lib/ShareByMailProvider.php

index 6ab95b1e789fd288a6fbc7a185ab721942af00d6..597ac19669758046c019bef6747d032d15938856 100644 (file)
@@ -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);