From a18bdad44f85491b22fb94984bb9fecb83a08aa2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 May 2019 13:56:13 +0100
Subject: [PATCH] dont replace a redacted event

---
 src/models/event.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/models/event.js b/src/models/event.js
index 84c209fcf..130443310 100644
--- a/src/models/event.js
+++ b/src/models/event.js
@@ -761,6 +761,9 @@ utils.extend(module.exports.MatrixEvent.prototype, {
      * @param {MatrixEvent} newEvent the event with the replacing content.
      */
     makeReplaced(newEvent) {
+        if (this.isRedacted()) {
+            return;
+        }
         this._replacingEvent = newEvent;
     },