Allow noreply email address/from to be set in admin panel (#14975)

1 files changed, 10 insertions, 5 deletions

diff --git a/core/Mail.php b/core/Mail.php
index 64295c526e..ddc2299445 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -147,11 +147,7 @@ class Mail extends Zend_Mail
         return parent::setSubject($subject);
     }
 
-    /**
-     * @param string $email
-     * @return string
-     */
-    protected function parseDomainPlaceholderAsPiwikHostName($email)
+    public function getMailHost()
     {
         $hostname  = Config::getInstance()->mail['defaultHostnameIfEmpty'];
         $piwikHost = Url::getCurrentHost($hostname);
@@ -162,7 +158,16 @@ class Mail extends Zend_Mail
         if ($this->isHostDefinedAndNotLocal($url)) {
             $piwikHost = $url['host'];
         }
+        return $piwikHost;
+    }
 
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function parseDomainPlaceholderAsPiwikHostName($email)
+    {
+        $piwikHost = $this->getMailHost();
         return str_replace('{DOMAIN}', $piwikHost, $email);
     }