summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorFlorian Orben <florian.orben@gmail.com>2015-10-24 16:03:12 +0200
committerFlorian Orben <florian.orben@gmail.com>2015-10-29 17:26:34 +0100
commitaeb0a08d077d35e46451142be1e06a4718a2d6bb (patch)
tree1c9d77d32586568c8dc2f7873ed57a187f526333 /web
parent3e7ffafa97c61ddd2f479022e4d63bdf745fcac3 (diff)
downloadchat-aeb0a08d077d35e46451142be1e06a4718a2d6bb.tar.gz
chat-aeb0a08d077d35e46451142be1e06a4718a2d6bb.tar.bz2
chat-aeb0a08d077d35e46451142be1e06a4718a2d6bb.zip
fix markup if code is of unknown language
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/markdown.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 5be01d055..ca26f7701 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -104,7 +104,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
code(code, language) {
if (!language || highlightJs.listLanguages().indexOf(language) < 0) {
let parsed = super.code(code, language);
- return '<code class="hljs">' + parsed.substr(11, parsed.length - 17);
+ return '<code class="hljs">' + $(parsed).text() + '</code>';
}
let parsed = highlightJs.highlight(language, code);