summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/4608.bugfix1
-rw-r--r--synapse/handlers/room.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/4608.bugfix b/changelog.d/4608.bugfix
new file mode 100644

index 0000000000..e331a362c4 --- /dev/null +++ b/changelog.d/4608.bugfix
@@ -0,0 +1 @@ +Transfer Server ACLs on room upgrade. \ No newline at end of file diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 5e40e9ea46..f9af1f0046 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -284,6 +284,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.GuestAccess, ""), (EventTypes.RoomAvatar, ""), (EventTypes.Encryption, ""), + (EventTypes.ServerACL, ""), ) old_room_state_ids = yield self.store.get_filtered_current_state_ids(