diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-12 13:20:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 13:20:06 +0000 |
| commit | ba3f27b69abde42b7d7980c05461c4fb376b79cf (patch) | |
| tree | feddfc76d1854785b38929e80fe5bb5029a55e01 | |
| parent | Fixup changelog entries (diff) | |
| parent | Changelog (diff) | |
| download | synapse-ba3f27b69abde42b7d7980c05461c4fb376b79cf.tar.xz | |
Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade
Transfer Server ACLs on room upgrade
| -rw-r--r-- | changelog.d/4608.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 1 |
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( |