summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-23 15:22:48 +0000
committerErik Johnston <erik@matrix.org>2017-01-23 15:22:48 +0000
commit41dab8a22236691c34d8db283e80483470ee8fce (patch)
treeb3adb35373235153ccc859cae26719a1c02aad7b
parentMerge pull request #1836 from matrix-org/erikj/current_state_fix (diff)
downloadsynapse-41dab8a22236691c34d8db283e80483470ee8fce.tar.xz
Fix bug where current_state_events renamed to current_state_ids
-rw-r--r--synapse/state.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 383d32b163..29e7604322 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -200,11 +200,11 @@ class StateHandler(object):
                     (s.type, s.state_key): s.event_id for s in old_state
                 }
                 if event.is_state():
-                    context.current_state_events = dict(context.prev_state_ids)
+                    context.current_state_ids = dict(context.prev_state_ids)
                     key = (event.type, event.state_key)
-                    context.current_state_events[key] = event.event_id
+                    context.current_state_ids[key] = event.event_id
                 else:
-                    context.current_state_events = context.prev_state_ids
+                    context.current_state_ids = context.prev_state_ids
             else:
                 context.current_state_ids = {}
                 context.prev_state_ids = {}