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-24 21:55:44 +0200
commit9fd9fb1722edfa4aa2e77aa25abfe3e317160839 (patch)
treec2e765c2120b3ecd5bc8dcd0ec9a53dc53f4a6b4 /web
parent0f62befef06f7fc467571a87affdfa95fa1fbb81 (diff)
downloadchat-9fd9fb1722edfa4aa2e77aa25abfe3e317160839.tar.gz
chat-9fd9fb1722edfa4aa2e77aa25abfe3e317160839.tar.bz2
chat-9fd9fb1722edfa4aa2e77aa25abfe3e317160839.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 8cfcfdefd..f1d15615e 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -68,7 +68,7 @@ export 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);