summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-10 15:21:30 +0000
committerErik Johnston <erik@matrix.org>2014-11-10 15:21:30 +0000
commitcdc1b5d629b49300de848647bd2a80a024fae8f7 (patch)
treef95950a28632ff7666dd501eb957c05b95db83e8 /synapse
parentFix room handler test (diff)
downloadsynapse-cdc1b5d629b49300de848647bd2a80a024fae8f7.tar.xz
Fix regression where we did not return redacted events.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/_base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index a23f2b941b..2df64bdfeb 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -469,7 +469,7 @@ class SQLBaseStore(object): select_event_sql = "SELECT * FROM events WHERE event_id = ?" - for ev in events: + for i, ev in enumerate(events): signatures = self._get_event_origin_signatures_txn( txn, ev.event_id, ) @@ -522,6 +522,7 @@ class SQLBaseStore(object): if del_evs: ev = prune_event(ev) + events[i] = ev ev.redacted_because = del_evs[0] return events