summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-31 18:43:49 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-31 18:43:49 +0000
commit6c232a69dfa23dff154e49918b3133669e28d062 (patch)
tree132036afb62357a3a5ad757571c7331313d4bd08
parentremove slow code on userdir (#4534) (diff)
downloadsynapse-6c232a69dfa23dff154e49918b3133669e28d062.tar.xz
Revert "Break infinite loop on redaction in v3 rooms"
We've got a better fix of this now.

This reverts commit decb5698b3dabd0c42ec4ce085bb4bb580de8f3a.
-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 dc09a85087..57dae324c7 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 and False: + if not allow_rejected and entry.event.type == EventTypes.Redaction: if entry.event.internal_metadata.need_to_check_redaction(): orig = yield self.get_event( entry.event.redacts,