summaryrefslogtreecommitdiffstats
path: root/webapp/utils/markdown.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-04-04 19:21:31 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-04 19:21:31 -0400
commitf7a4c75a214fb239989618e9583d78f98256e66c (patch)
tree3d645fc2a62c96985c069a32e93e3ab9dd964616 /webapp/utils/markdown.jsx
parenta0c91ef4afceffb100c75bd67585021a13abc24e (diff)
downloadchat-f7a4c75a214fb239989618e9583d78f98256e66c.tar.gz
chat-f7a4c75a214fb239989618e9583d78f98256e66c.tar.bz2
chat-f7a4c75a214fb239989618e9583d78f98256e66c.zip
PLT-5702 Added special error page for private browsing error message (#5985)
Diffstat (limited to 'webapp/utils/markdown.jsx')
-rw-r--r--webapp/utils/markdown.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx
index db8e739e6..29547b7e1 100644
--- a/webapp/utils/markdown.jsx
+++ b/webapp/utils/markdown.jsx
@@ -163,6 +163,10 @@ class MattermostMarkdownRenderer extends marked.Renderer {
link(href, title, text) {
let outHref = href;
+ if (this.formattingOptions.linkFilter && !this.formattingOptions.linkFilter(outHref)) {
+ return text;
+ }
+
try {
let unescaped = unescape(href);
try {