MDL-52126 forum: Correct over-escaping of html-based emails
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 15 Nov 2015 09:33:19 +0000 (10:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 15 Nov 2015 12:16:42 +0000 (13:16 +0100)
mod/forum/templates/forum_post_email_htmlemail.mustache
mod/forum/templates/forum_post_emaildigestbasic_htmlemail.mustache

index bb32eac..f354b23 100644 (file)
 </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 }}
         <td class="content">
             {{# attachments }}
                 <div class="attachments">
-                    {{ attachments }}
+                    {{{ attachments }}}
                 </div>
             {{/ attachments }}
             {{{ message }}}
index 444d4c7..912b606 100644 (file)
@@ -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 }}"