summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-03-13 15:51:13 +0100
committerGitHub <noreply@github.com>2020-03-13 15:51:13 +0100
commit17722835c0b0f2bbd62bf4fd09a167985f921202 (patch)
treefabe324ea67ad1b3e5a789ef0d6d477fe0c9c9ac
parentcaf68bd68bb938ba4fc1e0a2f74097f8810bcf6d (diff)
parent856b7a210e3abd894f0b0beb12a5a4cd876a4448 (diff)
downloadnextcloud-server-17722835c0b0f2bbd62bf4fd09a167985f921202.tar.gz
nextcloud-server-17722835c0b0f2bbd62bf4fd09a167985f921202.zip
Merge pull request #19924 from nextcloud/backport/19910/stable18
[stable18] Do not use the instance name as user part of from mail addresses
-rw-r--r--lib/private/Mail/Mailer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index 7af3d16f75c..df5f2687daa 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -169,7 +169,7 @@ class Mailer implements IMailer {
$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
if (empty($message->getFrom())) {
- $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
+ $message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]);
}
$failedRecipients = [];