summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-18 16:22:56 -0500
committerGitHub <noreply@github.com>2017-04-18 16:22:56 -0500
commit47fe5e8f415ecd17d2755da7868651e214622238 (patch)
tree7f8b54663b7f6ce2ee53fb28198899d981a79f75
parentd379ac7545d5b4d69c5419501a5084073378bc57 (diff)
parentbae64e810e49fa43a8821b6095b1cf713467bdae (diff)
downloadnextcloud-server-47fe5e8f415ecd17d2755da7868651e214622238.tar.gz
nextcloud-server-47fe5e8f415ecd17d2755da7868651e214622238.zip
Merge pull request #4380 from nextcloud/show-instance-name-in-from
Add instance name to default sender
-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 852806b2e43..80988d85701 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -111,7 +111,7 @@ class Mailer implements IMailer {
$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
if (sizeof($message->getFrom()) === 0) {
- $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName())]);
+ $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
}
$failedRecipients = [];