diff --git a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php new file mode 100644 index 000000000..d03a288af --- /dev/null +++ b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php @@ -0,0 +1,23 @@ +content_html = preg_replace("/({{\s*message\s*[|]raw\s*}})/i", "{{ content|raw }}", $layout->content_html); + $layout->content_text = preg_replace("/({{\s*message\s*[|]raw\s*}})/i", "{{ content|raw }}", $layout->content_text); + $layout->forceSave(); + } + catch (Exception $ex) {} + } + } + + public function down() + { + } +} diff --git a/modules/system/database/seeds/SeedSetupMailLayouts.php b/modules/system/database/seeds/SeedSetupMailLayouts.php index 020645286..20a4f4b3c 100644 --- a/modules/system/database/seeds/SeedSetupMailLayouts.php +++ b/modules/system/database/seeds/SeedSetupMailLayouts.php @@ -31,11 +31,11 @@ $html = ' - {{ message|raw }} + {{ content|raw }} '; -$text = '{{ message|raw }}'; +$text = '{{ content|raw }}'; MailLayout::create([ 'is_locked' => true, @@ -53,13 +53,13 @@ $html = ' - {{ message|raw }} + {{ content|raw }}

This is an automatic message. Please do not reply to it.

'; -$text = '{{ message|raw }} +$text = '{{ content|raw }} --- diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php index 7c028e386..2195a24c8 100644 --- a/modules/system/models/MailTemplate.php +++ b/modules/system/models/MailTemplate.php @@ -124,9 +124,9 @@ class MailTemplate extends Model $html = $twig->render($template->content_html, $data); if ($template->layout) { $html = $twig->render($template->layout->content_html, [ - 'message' => $html, + 'content' => $html, 'css' => $template->layout->content_css - ]); + ] + (array) $data); } $message->setBody($html, 'text/html'); @@ -137,7 +137,9 @@ class MailTemplate extends Model if (strlen($template->content_text)) { $text = $twig->render($template->content_text, $data); if ($template->layout) { - $text = $twig->render($template->layout->content_text, ['message' => $text]); + $text = $twig->render($template->layout->content_text, [ + 'content' => $text + ] + (array) $data); } $message->addPart($text, 'text/plain');