wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18733 from exner104/patch-1

Browse source 
Wrong email sender fix #18730
This commit is contained in:
Roeland Jago Douma 2020-01-08 13:02:05 +01:00 committed by GitHub
commit 7e95c88c5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/sharebymail/lib/ShareByMailProvider.php
View file

@ -620,9 +620,15 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
$emailTemplate->addFooter();
if ($initiatorEMailAddress) {
$message->setFrom([$initiatorEMailAddress => $initiatorDisplayName]);
}
$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);
$this->mailer->send($message);