matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into matthew/twemoji

Browse Source
This commit is contained in:
Matthew Hodgson
2019-05-20 16:38:44 +01:00
committed by GitHub
parent e764ba4890 db73e641ea
commit d3f06763b3
17 changed files with 236 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/HtmlUtils.js
View File

@@ -473,8 +473,8 @@ export function bodyToHtml(content, highlights, opts={}) {
});
return isDisplayedWithHtml ?
<span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
<span className={className} dir="auto">{ strippedBody }</span>;
<span key="body" className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
<span key="body" className={className} dir="auto">{ strippedBody }</span>;
}
/**