diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-08 13:02:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 13:02:05 +0100 |
| commit | 7e95c88c5fa4734099884d3fcb5daa16858aa7db (patch) | |
| tree | 1e1b252e42ef26c858a06a1d1219c8841309d414 | |
| parent | c08a94988164c6bf2aff697859ac2d7c8e9d4dd8 (diff) | |
| parent | 5c517baf9837f002a58a352bdcc40ad9db3bc9a2 (diff) | |
| download | nextcloud-server-7e95c88c5fa4734099884d3fcb5daa16858aa7db.tar.gz nextcloud-server-7e95c88c5fa4734099884d3fcb5daa16858aa7db.zip | |
Merge pull request #18733 from exner104/patch-1
Wrong email sender fix #18730
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 005101bd2fa..597ac196697 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -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); |