summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-28 18:32:39 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-28 18:32:44 +0100
commit722c19d0338cf5476c8a4f437a39422a72ebb263 (patch)
tree7b83dfe1ffe0be1fffba2a56e0933430aeb74d23 /synapse/handlers
parentStart fleshing out architecture section. Moar .rst formatting! Reword some co... (diff)
downloadsynapse-722c19d0338cf5476c8a4f437a39422a72ebb263.tar.xz
Fix FederationHandler to event.origin
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 1cc820fb5b..eac110419c 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -146,7 +146,7 @@ class FederationHandler(BaseHandler):
                 # Huh, let's try and get the current state
                 try:
                     yield self.replication_layer.get_state_for_context(
-                        origin, event.room_id
+                        event.origin, event.room_id
                     )
 
                     hosts = yield self.store.get_joined_hosts_for_room(