PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3151 from matrix-org/bwindels/e2e-edit-history

Browse source 
Make edit history work in encrypted rooms.
This commit is contained in:
Bruno Windels 2019-06-27 13:16:10 +00:00 committed by GitHub
commit f18c389f2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/messages/EditHistoryMessage.js
View file

@ -37,7 +37,8 @@ export default class EditHistoryMessage extends React.PureComponent {
render() { render() {
const {mxEvent} = this.props; const {mxEvent} = this.props;
const content = mxEvent.event.content["m.new_content"] || mxEvent.event.content; const originalContent = mxEvent.getOriginalContent();
const content = originalContent["m.new_content"] || originalContent;
const contentElements = HtmlUtils.bodyToHtml(content); const contentElements = HtmlUtils.bodyToHtml(content);
let contentContainer; let contentContainer;
if (mxEvent.getContent().msgtype === "m.emote") { if (mxEvent.getContent().msgtype === "m.emote") {