Merge pull request #7014 from RocketChat/parse-admin-html-descriptions

[FIX] Parse HTML on admin setting's descriptions
RocketChat · May 31, 2017 · 90ef85f · 90ef85f
2 parents df71c2b + a54ff14
commit 90ef85f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
@@ -90,4 +90,5 @@ RocketChat.callbacks.add('renderMessage', MarkdownMessage, RocketChat.callbacks.
 
 if (Meteor.isClient) {
 	Blaze.registerHelper('RocketChatMarkdown', text => Markdown.parse(text));
+	Blaze.registerHelper('RocketChatMarkdownUnescape', text => Markdown.parseNotEscaped(text));
 }
diff --git a/packages/rocketchat-ui-admin/client/admin.html b/packages/rocketchat-ui-admin/client/admin.html
@@ -186,7 +186,7 @@ <h2>
 												{{/if}}
 
 												{{#if description}}
-													<div class="settings-description">{{{RocketChatMarkdown description}}}</div>
+													<div class="settings-description">{{{RocketChatMarkdownUnescape description}}}</div>
 												{{/if}}
 												{{#if alert}}
 													<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention secondary-font-color"></i>{{{_ alert}}}</div>