summaryrefslogtreecommitdiffstats
path: root/webapp/utils/markdown.jsx
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-08-08 09:58:28 +0100
committerGitHub <noreply@github.com>2017-08-08 09:58:28 +0100
commita4ce7371ca132f52a446f29ef4d9d5adc61278da (patch)
tree2098d0e0ba18bd76aa40527faa4aaa9ca3168301 /webapp/utils/markdown.jsx
parentf4638aecec2933f20efb4b95c2e0a90c22b47b43 (diff)
downloadchat-a4ce7371ca132f52a446f29ef4d9d5adc61278da.tar.gz
chat-a4ce7371ca132f52a446f29ef4d9d5adc61278da.tar.bz2
chat-a4ce7371ca132f52a446f29ef4d9d5adc61278da.zip
Revert "PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109)" (#7147)
This reverts commit f4638aecec2933f20efb4b95c2e0a90c22b47b43.
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 d424d9544..8733e6200 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.pattern.test(href)) {
+ if (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.pattern.test(outHref);
+ internalLink = pattern.test(outHref);
}
if (internalLink) {