From aad28c51e936490bfc2ec2638f37777e65f30bdd Mon Sep 17 00:00:00 2001
From: Paul Ilea <paul@sgalinski.de>
Date: Thu, 28 Mar 2019 22:18:19 +0200
Subject: [PATCH] [BUGFIX] Fix from name and address fallback priority
---
Classes/Service/MailTemplateService.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index f191999d..f6351da5 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -831,11 +831,17 @@ class MailTemplateService {
*/
private function loadTemplateValues($template): void {
$fromName = \trim($template->getFromName());
+ if ($fromName === '') {
+ $fromName = $this->fromName;
+ }
if ($fromName === '' && $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName']) {
$fromName = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
}
$fromMail = \trim($template->getFromMail());
+ if (!filter_var($fromMail, FILTER_VALIDATE_EMAIL)) {
+ $fromMail = $this->fromAddress;
+ }
if (!filter_var($fromMail, FILTER_VALIDATE_EMAIL)) {
$fromMail = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
if (!filter_var($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'], FILTER_VALIDATE_EMAIL)) {
--
GitLab