diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-09 14:47:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-09 14:47:27 +0000 |
| commit | 5eca288d280659e69fce5d5eca3e7bf09faac5f0 (patch) | |
| tree | ce7978111ad80afd324bb5936e1f4ba6a3e1f069 /synapse/state.py | |
| parent | Change the way we implement get_events to be less sucky (diff) | |
| download | synapse-5eca288d280659e69fce5d5eca3e7bf09faac5f0.tar.xz | |
Fix joining from an invite
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index d1d6f95246..ebec0ad9dc 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -166,13 +166,15 @@ class StateHandler(object): prev_state ) - if hasattr(event, "auth_events"): + if hasattr(event, "auth_events") and event.auth_events: auth_ids = zip(*event.auth_events)[0] context.auth_events = { k: v for k, v in context.current_state.items() if v.event_id in auth_ids } + else: + context.auth_events = {} defer.returnValue(prev_state) |