diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
| commit | 0e367563838de76972bac1fd7bc3ab3943b9a57e (patch) | |
| tree | f3de1ae204fa232033d8951c31a45a71a797d94c /synapse/events/utils.py | |
| parent | Support clients supplying older tokens, fix short poll test (diff) | |
| parent | Merge pull request #337 from matrix-org/markjh/v2_sync_joining (diff) | |
| download | synapse-0e367563838de76972bac1fd7bc3ab3943b9a57e.tar.xz | |
Merge branch 'develop' into markjh/room_tags
Diffstat (limited to 'synapse/events/utils.py')
| -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: |