summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-31 00:23:58 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-31 00:23:58 +0000
commitdecb5698b3dabd0c42ec4ce085bb4bb580de8f3a (patch)
treea55b16aedba4bb36e7824a132b27b91bb1223301
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
downloadsynapse-decb5698b3dabd0c42ec4ce085bb4bb580de8f3a.tar.xz
Break infinite loop on redaction in v3 rooms
-rw-r--r--synapse/storage/events_worker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py

index 57dae324c7..dc09a85087 100644 --- a/synapse/storage/events_worker.py +++ b/synapse/storage/events_worker.py
@@ -177,7 +177,7 @@ class EventsWorkerStore(SQLBaseStore): # Starting in room version v3, some redactions need to be rechecked if we # didn't have the redacted event at the time, so we recheck on read # instead. - if not allow_rejected and entry.event.type == EventTypes.Redaction: + if not allow_rejected and entry.event.type == EventTypes.Redaction and False: if entry.event.internal_metadata.need_to_check_redaction(): orig = yield self.get_event( entry.event.redacts,