diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-25 18:31:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-25 18:31:41 +0000 |
| commit | ae2a957dbacc38f1126e2eca160f17322c710d26 (patch) | |
| tree | ac1a5a65f1468214cc7e03a1e6a489f20ba65a74 /synapse/handlers/room.py | |
| parent | Merge pull request #4470 from matrix-org/erikj/require_format_version (diff) | |
| download | synapse-ae2a957dbacc38f1126e2eca160f17322c710d26.tar.xz | |
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 cb8c5f77dd..19b4ee35d2 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_exiting_room( requester, |