diff options
| author | Richard van der Hoff <richard@matrix.org> | 2022-06-13 11:34:59 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2022-06-13 11:34:59 +0100 |
| commit | f68b5e5773a9e74c0f895190aaedce41f8565fa7 (patch) | |
| tree | 0601c8b98bc68e25e7466cd220d8034cac29f27f /synapse/handlers/room.py | |
| parent | Revert "Changelog" (diff) | |
| parent | changelog (diff) | |
| download | synapse-f68b5e5773a9e74c0f895190aaedce41f8565fa7.tar.xz | |
Merge branch 'rav/simplify_event_auth_interface' into develop
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 520663f172..d8918ee1aa 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -226,10 +226,9 @@ class RoomCreationHandler: }, }, ) - old_room_version = await self.store.get_room_version(old_room_id) - validate_event_for_room_version(old_room_version, tombstone_event) + validate_event_for_room_version(tombstone_event) await self._event_auth_handler.check_auth_rules_from_context( - old_room_version, tombstone_event, tombstone_context + tombstone_event, tombstone_context ) # Upgrade the room |