From 81b28e393872e7db596215216c53518c0b911309 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 15 Jul 2017 00:55:56 +1000
Subject: [PATCH] Render order should be Twig -> Markdown -> Html Use
 unrendered markdown as defaul text template

---
 modules/system/classes/MailManager.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index 7e5667417..bd32de888 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -63,9 +63,11 @@ class MailManager
         /*
          * HTML contents
          */
-        $templateHtml = Markdown::parse($template->content_html);
+        $templateHtml = $template->content_html;
 
         $html = Twig::parse($templateHtml, $data);
+        $html = Markdown::parse($html);
+
         if ($template->layout) {
             $html = Twig::parse($template->layout->content_html, [
                 'content' => $html,
@@ -78,16 +80,20 @@ class MailManager
         /*
          * Text contents
          */
-        if (strlen($template->content_text)) {
-            $text = Twig::parse($template->content_text, $data);
-            if ($template->layout) {
-                $text = Twig::parse($template->layout->content_text, [
-                    'content' => $text
-                ] + (array) $data);
-            }
+        $templateText = $template->content_text;
 
-            $message->addPart($text, 'text/plain');
+        if (!strlen($template->content_text)) {
+            $templateText = $template->content_html;
         }
+
+        $text = Twig::parse($templateText, $data);
+        if ($template->layout) {
+            $text = Twig::parse($template->layout->content_text, [
+                'content' => $text
+            ] + (array) $data);
+        }
+
+        $message->addPart($text, 'text/plain');
     }
 
     //