From 593aaa536676c9d52b997f9bd0b5cff5baa140d6 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Sun, 15 Nov 2015 10:33:19 +0100
Subject: [PATCH] MDL-52126 forum: Correct over-escaping of html-based emails

---
 .../templates/forum_post_email_htmlemail.mustache      | 10 +++++-----
 .../forum_post_emaildigestbasic_htmlemail.mustache     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/forum/templates/forum_post_email_htmlemail.mustache b/mod/forum/templates/forum_post_email_htmlemail.mustache
index bb32eac2f01..f354b2333a7 100644
--- a/mod/forum/templates/forum_post_email_htmlemail.mustache
+++ b/mod/forum/templates/forum_post_email_htmlemail.mustache
@@ -81,14 +81,14 @@
 </head>
 <body id="email">
 <div class="navbar">
-    <a target="_blank" href="{{{ courselink }}}">{{ coursename }}</a>
+    <a target="_blank" href="{{{ courselink }}}">{{{ coursename }}}</a>
     &raquo;
     <a target="_blank" href="{{{ forumindexlink }}}">{{# str }} forums, forum {{/ str }}</a>
     &raquo;
-    <a target="_blank" href="{{{ forumviewlink }}}">{{ forumname }}</a>
+    <a target="_blank" href="{{{ forumviewlink }}}">{{{ forumname }}}</a>
 {{# showdiscussionname }}
     &raquo;
-    <a target="_blank" href="{{{ discussionlink }}}">{{ discussionname }}</a>
+    <a target="_blank" href="{{{ discussionlink }}}">{{{ discussionname }}}</a>
 {{/ showdiscussionname }}
 </div>
 
@@ -99,7 +99,7 @@
         </td>
         <td class="topic {{# firstpost }}starter{{/ firstpost }}">
             <div class="subject">
-                {{ subject }}
+                {{{ subject }}}
             </div>
             <div class="author">
                 {{# str }} bynameondate, forum, { "name": "<a target='_blank' href='{{{ authorlink }}}'>{{ authorfullname }}</a>", "date": "{{ postdate }}" } {{/ str }}
@@ -118,7 +118,7 @@
         <td class="content">
             {{# attachments }}
                 <div class="attachments">
-                    {{ attachments }}
+                    {{{ attachments }}}
                 </div>
             {{/ attachments }}
             {{{ message }}}
diff --git a/mod/forum/templates/forum_post_emaildigestbasic_htmlemail.mustache b/mod/forum/templates/forum_post_emaildigestbasic_htmlemail.mustache
index 444d4c7c83d..912b606677b 100644
--- a/mod/forum/templates/forum_post_emaildigestbasic_htmlemail.mustache
+++ b/mod/forum/templates/forum_post_emaildigestbasic_htmlemail.mustache
@@ -42,7 +42,7 @@
     }
 }}
 <div>
-  <a target="_blank" href="{{{ permalink }}}">{{ subject }}</a>
+  <a target="_blank" href="{{{ permalink }}}">{{{ subject }}}</a>
   {{# str }} bynameondate, forum, {
       "name": "<a target=\"_blank\" href=\"{{{ authorlink }}}\">{{ authorfullname }}</a>",
       "date": "{{ postdate }}"