summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-27 17:28:55 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-27 17:28:55 +0100
commit357dd1871d5d7d9761321ddc7092abac9bfe3574 (patch)
tree26a11bd98ec0167d4bf81d6117ad45f50a5e7246 /synapse/handlers/_base.py
parentMerge branch 'develop' into storage_transactions (diff)
parentFix tests. (diff)
downloadsynapse-357dd1871d5d7d9761321ddc7092abac9bfe3574.tar.xz
Merge branch 'develop' into storage_transactions
Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 85a0f5dff5..f141e92ce2 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -44,7 +44,7 @@ class BaseRoomHandler(BaseHandler):
         )))
         event.destinations = list(destinations)
 
-        self.notifier.on_new_room_event(event, extra_users=[])
+        self.notifier.on_new_room_event(event, extra_users=extra_users)
 
         federation_handler = self.hs.get_handlers().federation_handler
         yield federation_handler.handle_new_event(event, snapshot)