Correctly use default room version if none is set

matrix-org · Jan 28, 2019 · d758d53 · d758d53
1 parent f01c748
commit d758d53
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
@@ -22,7 +22,7 @@
 from twisted.internet import defer
 from twisted.internet.defer import succeed
 
-from synapse.api.constants import MAX_DEPTH, EventTypes, Membership
+from synapse.api.constants import MAX_DEPTH, EventTypes, Membership, RoomVersions
 from synapse.api.errors import (
     AuthError,
     Codes,
@@ -612,7 +612,7 @@ def handle_new_client_event(
         """
 
         if event.is_state() and (event.type, event.state_key) == (EventTypes.Create, ""):
-            room_version = event.content["room_version"]
+            room_version = event.content.get("room_version", RoomVersions.V1)
         else:
             room_version = yield self.store.get_room_version(event.room_id)