Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorexner104 <59639860+exner104@users.noreply.github.com>2020-01-08 11:47:55 +0300
committerGitHub <noreply@github.com>2020-01-08 11:47:55 +0300
commit44eba5cdc68651cd0915891420f31af42b8de5c3 (patch)
tree67faa92e8eefe80f1cce91732d398519ecdfcf64 /apps/sharebymail/lib
parent69ae7abe72fd032adbec1c7dc01fca64aea2fbe8 (diff)
Wrong email sender fix #18730
Wrong email sender in app sharebymail when sending password to owner fix #18730
Diffstat (limited to 'apps/sharebymail/lib')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 005101bd2fa..6ab95b1e789 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -620,9 +620,7 @@ 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]);
- }
+ $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
$message->useTemplate($emailTemplate);
$this->mailer->send($message);