summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-12-01 13:40:00 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2015-12-01 13:40:00 -0500
commit4896e626e716d0f0a71ab28d273367bf3de2d045 (patch)
tree4ea1a08d17eea940b7d275186a5555faedbe0d85
parent2b2ee62a1df0504fff3f3e0e59966db1cd297531 (diff)
parentdd079733fd16cfd182c97219af10c46336d0f910 (diff)
downloadchat-4896e626e716d0f0a71ab28d273367bf3de2d045.tar.gz
chat-4896e626e716d0f0a71ab28d273367bf3de2d045.tar.bz2
chat-4896e626e716d0f0a71ab28d273367bf3de2d045.zip
Merge pull request #1561 from florianorben/PLT-1182
PLT-1182: "Recent Mention" search brings up username as "[username]undefined
-rw-r--r--web/react/utils/text_formatting.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index 3a912fd75..f0bd46f9d 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -188,7 +188,7 @@ function highlightCurrentMentions(text, tokens) {
const newAlias = `MM_SELFMENTION${index}`;
newTokens.set(newAlias, {
- value: `<span class='mention-highlight'>${alias}</span>` + token.extraText,
+ value: `<span class='mention-highlight'>${alias}</span>` + (token.extraText || ''),
originalText: token.originalText
});
output = output.replace(alias, newAlias);