mirror of https://github.com/vector-im/riot-web
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to
commit
4a0a5c6bef
|
@ -479,11 +479,9 @@ export function bodyToHtml(content, highlights, opts={}) {
|
|||
'markdown-body': isHtml,
|
||||
});
|
||||
|
||||
if (isHtml) {
|
||||
return <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" />;
|
||||
}
|
||||
|
||||
return <span className={className} dir="auto">{ strippedBody }</span>;
|
||||
return isHtml ?
|
||||
<span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
|
||||
<span className={className} dir="auto">{ strippedBody }</span>;
|
||||
}
|
||||
|
||||
export function emojifyText(text) {
|
||||
|
|
Loading…
Reference in New Issue