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/state/__init__.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/state/__init__.py')
| -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 e9ecb00277..2fca51d0b2 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -611,7 +611,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2, ): return v2.resolve_events_with_store( - state_sets, event_map, state_res_store, + room_version, state_sets, event_map, state_res_store, ) else: # This should only happen if we added a version but forgot to add it to |