fix: rebase issues

PruvoNet · Aug 21, 2023 · ebf9124 · ebf9124
1 parent 5b29bce
commit ebf9124
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -25,6 +25,7 @@
             </div>
             <div class="row">
                 <?php echo $view['form']->rowIfExists($fields, 'mailer_reply_to_email', $template); ?>
+                <?php echo $view['form']->rowIfExists($fields, 'mailer_default_bcc', $template); ?>
             </div>
             <div class="row">
                 <?php echo $view['form']->rowIfExists($fields, 'mailer_return_path', $template); ?>