summaryrefslogtreecommitdiffstats
path: root/webapp/utils/markdown.jsx
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-08-07 10:10:33 +0100
committerSaturnino Abril <saturnino.abril@gmail.com>2017-08-07 17:10:33 +0800
commitf4638aecec2933f20efb4b95c2e0a90c22b47b43 (patch)
treec87065524a9c82209efc569f5fc2bf98ce914d2d /webapp/utils/markdown.jsx
parent9eb8d93a0d958b830b1f759dd0917629bd79c8e6 (diff)
downloadchat-f4638aecec2933f20efb4b95c2e0a90c22b47b43.tar.gz
chat-f4638aecec2933f20efb4b95c2e0a90c22b47b43.tar.bz2
chat-f4638aecec2933f20efb4b95c2e0a90c22b47b43.zip
PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109)
Diffstat (limited to 'webapp/utils/markdown.jsx')
-rw-r--r--webapp/utils/markdown.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx
index 8733e6200..d424d9544 100644
--- a/webapp/utils/markdown.jsx
+++ b/webapp/utils/markdown.jsx
@@ -175,7 +175,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
if (this.formattingOptions.searchPatterns) {
for (const pattern of this.formattingOptions.searchPatterns) {
- if (pattern.test(href)) {
+ if (pattern.pattern.test(href)) {
output += ' search-highlight';
break;
}
@@ -189,7 +189,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
if (this.formattingOptions.siteURL) {
const pattern = new RegExp('^' + TextFormatting.escapeRegex(this.formattingOptions.siteURL) + '\\/(?:signup_user_complete|[^\\/]+\\/(?:pl|channels))\\/');
- internalLink = pattern.test(outHref);
+ internalLink = pattern.pattern.test(outHref);
}
if (internalLink) {