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

only strip reply fallbacks if the lab is enabled 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2018-03-09 23:12:13 +00:00
parent ed8f087eb6
commit 023632e7e4
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
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/TextualBody.js
View File

@ -422,10 +422,11 @@ module.exports = React.createClass({
const mxEvent = this.props.mxEvent;
const content = mxEvent.getContent();
const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") && ReplyThread.getInReplyTo(mxEvent);
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
// Part of Replies fallback support
stripReplyFallback: Boolean(ReplyThread.getInReplyTo(mxEvent)),
stripReplyFallback: stripReply,
});
if (this.props.highlightLink) {