Transform email header string to header array & replace it at various situations.

[friendica.git] / src / Util / Emailer.php

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1254c661887e9fe8759ac25972415e5e54a946c8..0594937ec8cb44fb76924bfa87645bdf4b1323f0 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, ':'));
@@ -151,7 +151,7 @@ class Emailer
                                . rand(10000, 99999);
 
                // generate a multipart/alternative message header
-               $messageHeader = $email->getAdditionalMailHeader() .
+               $messageHeader = $email->getAdditionalMailHeaderString() .
                                 "From: $fromName <{$fromAddress}>\n" .
                                 "Reply-To: $fromName <{$replyTo}>\n" .
                                 "MIME-Version: 1.0\n" .