Merge pull request #9884 from c0dzilla/parse

[FIX] Parsing messages with multiple markdown matches ignore some tokens
RocketChat · Feb 26, 2018 · 5033cab · 5033cab
2 parents 4cdb12d + 11e0601
commit 5033cab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/rocketchat-ui-message/client/renderMessageBody.js b/packages/rocketchat-ui-message/client/renderMessageBody.js
@@ -11,7 +11,8 @@ renderMessageBody = function(msg) {
 	const message = RocketChat.callbacks.run('renderMessage', msg);
 
 	if (message.tokens && message.tokens.length > 0) {
-		for (const {token, text} of message.tokens) {
+		// Unmounting tokens(LIFO)
+		for (const {token, text} of message.tokens.reverse()) {
 			message.html = message.html.replace(token, () => text); // Uses lambda so doesn't need to escape $
 		}
 	}