Commit a2711427 authored by Georgi Mateev's avatar Georgi Mateev
Browse files

[BUGFIX] 1584 Fixed a logical error

parent fcac8be9
......@@ -873,11 +873,6 @@ class MailTemplateService {
$this->setSubjectToSend($subject);
$this->mailMessage->setSubject($subject);
// Load the values from the template if they are set
if (!$isNewsletter && $template !== NULL) {
$this->loadTemplateValues($template);
}
// Parse the markers
if ($this->fromName) {
$this->setFromName(
......@@ -985,6 +980,11 @@ class MailTemplateService {
$registerService = GeneralUtility::makeInstance(RegisterService::class);
// Load the values from the template if they are set
if (!$isNewsletter && $template !== NULL) {
$this->loadTemplateValues($template);
}
// get default template content from register array
$defaultTemplateContent = $this->getDefaultTemplateContent($template, $registerService);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment