diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-31 10:56:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 10:56:42 +0000 |
| commit | 160522e32cb92b5fb4f0bcd8e3c53d0a4d04ad3f (patch) | |
| tree | f49255e22a2840ac954f911e7b263a1e709ce9c4 /synapse/state | |
| parent | Fix bug with getting missing auth event during join 500'ed (#6810) (diff) | |
| parent | newsfile (diff) | |
| download | synapse-160522e32cb92b5fb4f0bcd8e3c53d0a4d04ad3f.tar.xz | |
Merge pull request #6820 from matrix-org/rav/get_room_version_id
Make `get_room_version` return a RoomVersion object
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index cacd0c0c2b..fdd6bef6b4 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -394,7 +394,7 @@ class StateHandler(object): delta_ids=delta_ids, ) - room_version = yield self.store.get_room_version(room_id) + room_version = yield self.store.get_room_version_id(room_id) result = yield self._state_resolution_handler.resolve_state_groups( room_id, |