diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-09 16:52:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-09 16:52:21 +0100 |
| commit | 5c1f886c75979b606c1e8bb45fcd8b7d26a71f39 (patch) | |
| tree | ee651459cda811d4ac5d11f1e2fc4d9c06df037a /synapse/handlers/room_member.py | |
| parent | Update (diff) | |
| parent | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets (diff) | |
| download | synapse-5c1f886c75979b606c1e8bb45fcd8b7d26a71f39.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 19e44b5460..1edc657f8a 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -216,8 +216,8 @@ class RoomMemberHandler(object): yield self.copy_room_tags_and_direct_to_room( predecessor["room_id"], room_id, user_id ) - # Move over old push rules - yield self.store.move_push_rules_from_room_to_room_for_user( + # Copy over push rules + yield self.store.copy_push_rules_from_room_to_room_for_user( predecessor["room_id"], room_id, user_id ) elif event.membership == Membership.LEAVE: |