OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to

pull/21833/head
Michael Telatynski 2018-04-27 11:23:12 +01:00
parent 82d117974f 0f11bc62cc
commit 4a0a5c6bef
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/HtmlUtils.js
View File

@ -479,11 +479,9 @@ export function bodyToHtml(content, highlights, opts={}) {
'markdown-body': isHtml, 'markdown-body': isHtml,
}); });
if (isHtml) { return isHtml ?
return <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" />; <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
} <span className={className} dir="auto">{ strippedBody }</span>;
return <span className={className} dir="auto">{ strippedBody }</span>;
} }
export function emojifyText(text) { export function emojifyText(text) {