Fall back to ##admin_email## automatically if not defined otherwise a…

…s it used to be in v1
terminal42 · May 8, 2024 · 2a93f1f · 2a93f1f
1 parent ba534a3
commit 2a93f1f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Gateway/MailerGateway.php b/src/Gateway/MailerGateway.php
@@ -95,7 +95,12 @@ private function createEmailStamp(Parcel $parcel): EmailStamp
         $stamp = $stamp->withTo($this->replaceTokensAndInsertTags($parcel, $languageConfig->getString('recipients')));
         $stamp = $stamp->withSubject($this->replaceTokensAndInsertTags($parcel, $languageConfig->getString('email_subject')));
 
-        if ('' !== ($from = $this->replaceTokensAndInsertTags($parcel, $languageConfig->getString('email_sender_address')))) {
+        // Automatically fall back to ##admin_email## if no sender was configured. In
+        // case this token does not exist either, it will result in the same error as not
+        // supplying a sender address at all.
+        $from = '' !== $languageConfig->getString('email_sender_address') ? $languageConfig->getString('email_sender_address') : '##admin_email##';
+
+        if ('' !== ($from = $this->replaceTokensAndInsertTags($parcel, $from))) {
             $stamp = $stamp->withFrom($from);
         }