MDL-52126 forum: Correct over-escaping of text-based emails

diff --git a/mod/forum/templates/forum_post_email_textemail.mustache b/mod/forum/templates/forum_post_email_textemail.mustache
index 6c3fed9..f3f6188 100644 (file)
--- a/mod/forum/templates/forum_post_email_textemail.mustache
+++ b/mod/forum/templates/forum_post_email_textemail.mustache
@@ -42,17 +42,17 @@
     * unsubscribediscussionlink
     * forumindexlink
 }}
-{{ coursename }} -> {{# str }} forums, forum {{/ str }} -> {{ forumname }}{{# showdiscussionname }} -> {{ discussionname }} {{/ showdiscussionname }}
+{{{ coursename }}} -> {{# str }} forums, forum {{/ str }} -> {{{ forumname }}}{{# showdiscussionname }} -> {{{ discussionname }}} {{/ showdiscussionname }}
 {{ discussionlink }}
-{{ subject }}
-{{# str }} bynameondate, forum, { "name": "{{ authorfullname }}", "date": "{{ postdate }}" } {{/ str }}
+{{{ subject }}}
+{{# str }} bynameondate, forum, { "name": "{{{ authorfullname }}}", "date": "{{ postdate }}" } {{/ str }}
 ---------------------------------------------------------------------
-{{ message }}
+{{{ message }}}
 
-{{ attachments }}
+{{{ attachments }}}
 ---------------------------------------------------------------------
 {{# canreply }}
-{{# str }} postmailinfolink, forum, { "coursename": "{{ coursename }}", "replylink": "{{ replylink }}" } {{/ str }}
+{{# str }} postmailinfolink, forum, { "coursename": "{{{ coursename }}}", "replylink": "{{ replylink }}" } {{/ str }}
 {{/ canreply }}
 {{# unsubscribeforumlink }}
 {{# str }} unsubscribelink, forum, {{{ unsubscribeforumlink }}} {{/ str }}

diff --git a/mod/forum/templates/forum_post_emaildigestbasic_textemail.mustache b/mod/forum/templates/forum_post_emaildigestbasic_textemail.mustache
index 4d4beb2..7f30cd9 100644 (file)
--- a/mod/forum/templates/forum_post_emaildigestbasic_textemail.mustache
+++ b/mod/forum/templates/forum_post_emaildigestbasic_textemail.mustache
@@ -33,5 +33,5 @@
 }}
 
 {{ discussionlink }}
-{{ subject }} {{# str }} bynameondate, forum, { "name": "{{ authorfullname }}", "date": "{{ postdate }}" } {{/ str }}
+{{{ subject }}} {{# str }} bynameondate, forum, { "name": "{{{ authorfullname }}}", "date": "{{ postdate }}" } {{/ str }}
 ---------------------------------------------------------------------

diff --git a/mod/forum/templates/forum_post_emaildigestfull_textemail.mustache b/mod/forum/templates/forum_post_emaildigestfull_textemail.mustache
index 7ef386d..deff33e 100644 (file)
--- a/mod/forum/templates/forum_post_emaildigestfull_textemail.mustache
+++ b/mod/forum/templates/forum_post_emaildigestfull_textemail.mustache
@@ -37,11 +37,11 @@
 }}
 
 {{ discussionlink }}
-{{ subject }} ({{{ permalink }}})
-{{# str }} bynameondate, forum, { "name": "{{ authorfullname }}", "date": "{{ postdate }}" } {{/ str }}
+{{{ subject }}} ({{{ permalink }}})
+{{# str }} bynameondate, forum, { "name": "{{{ authorfullname }}}", "date": "{{ postdate }}" } {{/ str }}
 ---------------------------------------------------------------------
-{{ message }}
+{{{ message }}}
 
-{{ attachments }}
+{{{ attachments }}}
 ---------------------------------------------------------------------
 {{# str }} digestmailpostlink, forum, {{{ forumindexlink }}} {{/ str }}