summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-27 16:55:51 +0000
committerMark Haines <mark.haines@matrix.org>2014-10-27 16:55:51 +0000
commit4841b6d4ba7fa15c57476e8d3c8e2b110d8e2f8e (patch)
tree8c76edb2425b696d36b7116879d08aa776db49bb /synapse
parentFix SYWEB-114 : Error message when trying to invite a user already in the room. (diff)
downloadsynapse-4841b6d4ba7fa15c57476e8d3c8e2b110d8e2f8e.tar.xz
Remove duplicate join_event from create_room
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index c0f9a7c807..21ae03df0d 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -169,11 +169,6 @@ class RoomCreationHandler(BaseHandler):
             content=content
         )
 
-        yield self.hs.get_handlers().room_member_handler.change_membership(
-            join_event,
-            do_auth=False
-        )
-
         content = {"membership": Membership.INVITE}
         for invitee in invite_list:
             invite_event = self.event_factory.create_event(