diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
| commit | 2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682 (patch) | |
| tree | d5d1c71f050d27e929daa72954704ad330cc9194 /synapse/events | |
| parent | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff) | |
| parent | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 (diff) | |
| download | synapse-2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682.tar.xz | |
Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 9989b76591..44cc1ef132 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -129,10 +129,9 @@ def format_event_for_client_v2(d): return d -def format_event_for_client_v2_without_event_id(d): +def format_event_for_client_v2_without_room_id(d): d = format_event_for_client_v2(d) d.pop("room_id", None) - d.pop("event_id", None) return d |