From 95b0c2e1c24d9acfa4da831ad84fa6413f4ec6f1 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Tue, 26 Sep 2017 19:10:25 +0200
Subject: [PATCH] [TASK] Only consider default template files. Language
templates now only from db
---
Classes/Service/MailTemplateService.php | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 2748c39e..b9335982 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -340,17 +340,13 @@ class MailTemplateService {
if ($template === NULL) {
$templatePath = self::$registerArray[$this->extensionKey][$this->templateName]['templatePath'];
- $templateFile = $templatePath . $this->language . '.template.html';
- if (file_exists($templateFile)) {
- $defaultTemplateContent = file_get_contents($templatePath . $this->language . '.template.html');
- } else {
- $defaultTemplateFile = $templatePath . 'template.html';
- if (file_exists($defaultTemplateFile)) {
- $defaultTemplateContent = file_get_contents($defaultTemplateFile);
- } else {
- return FALSE;
- }
+ // only standard template file is considered since version 4.1
+ $defaultTemplateFile = $templatePath . 'template.html';
+ if (file_exists($defaultTemplateFile)) {
+ $defaultTemplateContent = file_get_contents($defaultTemplateFile);
+ } else {
+ return FALSE;
}
} elseif (filter_var($template->getToAddress(), FILTER_VALIDATE_EMAIL)) {
$this->setToAddresses($template->getToAddress());
--
GitLab