Issue 8495: Only use "noreply" when no sender mail is defined

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1254c661887e9fe8759ac25972415e5e54a946c8..717366248f7a9f11e332c345809c99612cbd8f5c 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -64,7 +64,7 @@ class Emailer
                $this->l10n        = $defaultLang;
 
                $this->siteEmailAddress = $this->config->get('config', 'sender_email');
-               if (empty($sysEmailAddress)) {
+               if (empty($this->siteEmailAddress)) {
                        $hostname = $this->baseUrl->getHostname();
                        if (strpos($hostname, ':')) {
                                $hostname = substr($hostname, 0, strpos($hostname, ':'));

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 01f7476448635311b8886d736aa23de6bd258825..94a0f4902b0ba3c441e0cfe915b6c740fd985711 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -564,7 +564,8 @@ class Delivery
                                $headers  = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
                        }
                } else {
-                       $headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::baseUrl()->getHostname() . '>' . "\n";
+                       $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
+                       $headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
                }
 
                $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";