diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
| commit | adfe29ec0bedf394772e30583c271f142bccd3ba (patch) | |
| tree | ba4759be562a0f9f9cddc514968fd16e7b0faa90 /synapse/handlers/_base.py | |
| parent | incorporate review (diff) | |
| parent | Merge pull request #3584 from matrix-org/erikj/use_cached (diff) | |
| download | synapse-adfe29ec0bedf394772e30583c271f142bccd3ba.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index b6a8b3aa3b..704181d2d3 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -112,8 +112,9 @@ class BaseHandler(object): guest_access = event.content.get("guest_access", "forbidden") if guest_access != "can_join": if context: + current_state_ids = yield context.get_current_state_ids(self.store) current_state = yield self.store.get_events( - list(context.current_state_ids.values()) + list(current_state_ids.values()) ) else: current_state = yield self.state_handler.get_current_state( |