diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-28 20:09:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 20:09:38 +0000 |
| commit | f1a04462ebfde48cbd42c42f05d67710a7f5955c (patch) | |
| tree | 3bfb7acd4b72f69bc27299e19e37a133bea6bb63 /synapse/handlers/room.py | |
| parent | Fix worker TLS (#4492) (diff) | |
| parent | Correctly use default room version if none is set (diff) | |
| download | synapse-f1a04462ebfde48cbd42c42f05d67710a7f5955c.tar.xz | |
Merge pull request #4482 from matrix-org/erikj/event_auth_room_version
Pass through room version to event auth
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 388302de09..13ba9291b0 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -123,7 +123,10 @@ class RoomCreationHandler(BaseHandler): token_id=requester.access_token_id, ) ) - yield self.auth.check_from_context(tombstone_event, tombstone_context) + old_room_version = yield self.store.get_room_version(old_room_id) + yield self.auth.check_from_context( + old_room_version, tombstone_event, tombstone_context, + ) yield self.clone_existing_room( requester, |