diff --git a/app/bundles/EmailBundle/Helper/MailHelper.php b/app/bundles/EmailBundle/Helper/MailHelper.php index 828d2c51de8..a8bbe8c0474 100644 --- a/app/bundles/EmailBundle/Helper/MailHelper.php +++ b/app/bundles/EmailBundle/Helper/MailHelper.php @@ -249,8 +249,10 @@ class MailHelper * @param MauticFactory $factory * @param $mailer * @param null $from + * @param null $bcc */ private $embedImagesReplaces = []; + public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from = null, $bcc = null) { @@ -265,9 +267,9 @@ public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from $this->logError($e); } + $systemBccEmail = $factory->getParameter('mailer_default_bcc'); $systemFromEmail = $factory->getParameter('mailer_from_email'); $systemReplyToEmail = $factory->getParameter('mailer_reply_to_email'); - $systemBccEmail = $factory->getParameter('mailer_default_bcc'); $systemFromName = $this->cleanName( $factory->getParameter('mailer_from_name') ); @@ -697,6 +699,7 @@ public function reset($cleanSlate = true) $this->appendTrackingPixel = false; $this->queueEnabled = false; $this->from = $this->systemFrom; + $this->replyTo = $this->systemReplyTo; $this->headers = []; []; $this->source = []; @@ -2243,11 +2246,6 @@ private function setDefaultReplyTo($systemReplyToEmail =null, $systemFromEmail = $this->replyTo = $this->systemReplyTo; } - private function getMessageInstance(): MauticMessage - { - return new MauticMessage(); - } - private function setDefaultBcc($overrideBcc, $systemBcc) { $this->systemBcc = $overrideBcc ?: $systemBcc; diff --git a/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php index cb07b751f87..ec7bb54e016 100644 --- a/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php +++ b/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php @@ -25,6 +25,7 @@