summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-02 13:37:35 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-02 13:37:35 +0100
commit746773883438ccbb67ba307031afa96e883f43cb (patch)
treecabf8acccd29d969d267b26f8f53e8c33ce38b95 /synapse/handlers/room.py
parentMerge branch 'erikj/ratelimit_3pid_invite' of github.com:matrix-org/synapse i... (diff)
parentAdd admin api for sending server_notices (#5121) (diff)
downloadsynapse-746773883438ccbb67ba307031afa96e883f43cb.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 17628e2684..e37ae96899 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -402,7 +402,7 @@ class RoomCreationHandler(BaseHandler): yield directory_handler.create_association( requester, RoomAlias.from_string(alias), new_room_id, servers=(self.hs.hostname, ), - send_event=False, + send_event=False, check_membership=False, ) logger.info("Moved alias %s to new room", alias) except SynapseError as e: @@ -538,6 +538,7 @@ class RoomCreationHandler(BaseHandler): room_alias=room_alias, servers=[self.hs.hostname], send_event=False, + check_membership=False, ) preset_config = config.get(