diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
| commit | 8a0407c7e6b43a9e36dfaed228442cc8fb1361bd (patch) | |
| tree | 82e7a8610cb4f15094b23d6e3e0467f512390d04 /synapse/events | |
| parent | Surely we don't need to preserve 'events_default' twice (diff) | |
| parent | Merge pull request #338 from matrix-org/daniel/fixdb (diff) | |
| download | synapse-8a0407c7e6b43a9e36dfaed228442cc8fb1361bd.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 48548f8c40..9989b76591 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -154,7 +154,8 @@ def serialize_event(e, time_now_ms, as_client_event=True, if "redacted_because" in e.unsigned: d["unsigned"]["redacted_because"] = serialize_event( - e.unsigned["redacted_because"], time_now_ms + e.unsigned["redacted_because"], time_now_ms, + event_format=event_format ) if token_id is not None: |