Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade

Transfer Server ACLs on room upgrade
This commit is contained in:
Erik Johnston 2019-02-12 13:20:06 +00:00 committed by GitHub
commit ba3f27b69a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

1
changelog.d/4608.bugfix Normal file
View file

@ -0,0 +1 @@
Transfer Server ACLs on room upgrade.

View file

@ -284,6 +284,7 @@ class RoomCreationHandler(BaseHandler):
(EventTypes.GuestAccess, ""), (EventTypes.GuestAccess, ""),
(EventTypes.RoomAvatar, ""), (EventTypes.RoomAvatar, ""),
(EventTypes.Encryption, ""), (EventTypes.Encryption, ""),
(EventTypes.ServerACL, ""),
) )
old_room_state_ids = yield self.store.get_filtered_current_state_ids( old_room_state_ids = yield self.store.get_filtered_current_state_ids(