Rollback changes to renderMessageBody which were causing exception

RocketChat · Jul 3, 2017 · 8924b67 · 8924b67
1 parent bfcaf60
commit 8924b67
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/rocketchat-ui-message/client/renderMessageBody.js b/packages/rocketchat-ui-message/client/renderMessageBody.js
@@ -1,8 +1,10 @@
 /* global renderMessageBody:true */
 
 renderMessageBody = function(msg) {
-	if (_.trim(msg.msg) !== '') {
-		msg.html = _.escapeHTML(msg.msg);
+	msg.html = msg.msg;
+
+	if (_.trim(msg.html) !== '') {
+		msg.html = _.escapeHTML(msg.html);
 	}
 
 	const message = RocketChat.callbacks.run('renderMessage', msg);