Skip to content
Snippets Groups Projects
Commit 9e6956c1 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Bugfixes

parent 8f809e41
No related branches found
No related tags found
No related merge requests found
...@@ -809,21 +809,29 @@ class MailTemplateService { ...@@ -809,21 +809,29 @@ class MailTemplateService {
foreach ($extensionList as $extensionName) { foreach ($extensionList as $extensionName) {
$extensionConfigDirectory = ExtensionManagementUtility::extPath($extensionName); $extensionConfigDirectory = ExtensionManagementUtility::extPath($extensionName);
$extensionConfigDirectory .= self::CONFIG_PATH; $extensionConfigDirectory .= self::CONFIG_PATH;
$configFiles = GeneralUtility::getFilesInDir($extensionConfigDirectory);
foreach ($configFiles as $configFile) { if (\is_dir($extensionConfigDirectory)) {
$configArray = (include $extensionConfigDirectory . '/' . $configFile); $configFiles = GeneralUtility::getFilesInDir($extensionConfigDirectory);
$extensionKey = $configArray['extension_key'];
$templateKey = $configArray['template_key'];
if ($extensionKey === NULL || $templateKey === NULL) { foreach ($configFiles as $configFile) {
continue; if (!\file_exists($extensionConfigDirectory . '/' . $configFile)) {
} continue;
}
$registerArray = self::writeRegisterArrayEntry( $configArray = (include $extensionConfigDirectory . '/' . $configFile);
$registerArray, $extensionKey, $templateKey, $configArray $extensionKey = $configArray['extension_key'];
); $templateKey = $configArray['template_key'];
if ($extensionKey === NULL || $templateKey === NULL) {
continue;
}
$registerArray = self::writeRegisterArrayEntry(
$registerArray, $extensionKey, $templateKey, $configArray
);
}
} }
} }
return $registerArray; return $registerArray;
......
...@@ -20,7 +20,7 @@ module.tx_sgmail { ...@@ -20,7 +20,7 @@ module.tx_sgmail {
configurationLocation = project_theme configurationLocation = project_theme
# default html template file, which serves as a fallback for all mail templates # default html template file, which serves as a fallback for all mail templates
defaultHtmlTemplate = EXT:sg_mail/Configuration/MailTemplates/Default.html defaultHtmlTemplate = EXT:sg_mail/Configuration/MailTemplates/Template/Default.html
} }
# default template language # default template language
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment