[BUGFIX] use the default sender address if it is provided in the...

[BUGFIX] use the default sender address if it is provided in the LocalConfiguration; use TS constant as fallback

Classes/Service/MailTemplateService.php

@@ -165,7 +165,13 @@ class MailTemplateService {
 		/** @var PersistenceManager persistenceManager */
 		$this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
 
-		$this->fromAddress = $this->tsSettings['mail']['default']['from'];
+		// use defaultMailFromAddress if it is provided in LocalConfiguration.php; use the sg_mail TS setting as fallback
+		if ($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress']) {
+			$this->fromAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+		} else {
+			$this->fromAddress = $this->tsSettings['mail']['default']['from'];
+		}
+
 		$this->mailMessage->setFrom($this->fromAddress);
 		$this->bccAddresses = GeneralUtility::trimExplode(',', $this->tsSettings['mail']['default']['bcc']);
 		$this->ccAddresses = GeneralUtility::trimExplode(',', $this->tsSettings['mail']['default']['cc']);