Merge pull request #5295 from matrix-org/t3chguy/fix/15403
Fix edited replies being wrongly treated as big emoji
This commit is contained in:
commit
7205e5d2e5
1 changed files with 2 additions and 1 deletions
|
@ -401,7 +401,8 @@ export default class TextualBody extends React.Component {
|
||||||
const mxEvent = this.props.mxEvent;
|
const mxEvent = this.props.mxEvent;
|
||||||
const content = mxEvent.getContent();
|
const content = mxEvent.getContent();
|
||||||
|
|
||||||
const stripReply = ReplyThread.getParentEventId(mxEvent);
|
// only strip reply if this is the original replying event, edits thereafter do not have the fallback
|
||||||
|
const stripReply = !mxEvent.replacingEvent() && ReplyThread.getParentEventId(mxEvent);
|
||||||
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
|
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
|
||||||
disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'),
|
disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'),
|
||||||
// Part of Replies fallback support
|
// Part of Replies fallback support
|
||||||
|
|
Loading…
Reference in a new issue