summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-08 17:50:56 +0000
committerErik Johnston <erik@matrix.org>2014-12-08 17:50:56 +0000
commit609c31e8dfa23bce3b34500f28df4f8eaf740a91 (patch)
treef376ab7c28c37db5f358318555596e5d05afb468 /synapse/state.py
parentMore bug fixes (diff)
downloadsynapse-609c31e8dfa23bce3b34500f28df4f8eaf740a91.tar.xz
More bug fixes
Diffstat (limited to '')
-rw-r--r--synapse/state.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 19b408db45..d1d6f95246 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -160,13 +160,13 @@ class StateHandler(object):
         group, curr_state, prev_state = ret
 
         context.current_state = curr_state
-        context.state_group = group
+        context.state_group = group if not event.is_state() else None
 
         prev_state = yield self.store.add_event_hashes(
             prev_state
         )
 
-        if hasattr(event, "auth_events") and event.auth_events:
+        if hasattr(event, "auth_events"):
             auth_ids = zip(*event.auth_events)[0]
             context.auth_events = {
                 k: v