diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-01-15 16:00:24 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-01-15 16:00:24 +0000 |
| commit | 107f256cd8c8d72c7a36df7e426aded09c5657c9 (patch) | |
| tree | 788f2b18ebab979aa87462c7b1759da2e376320a /synapse/handlers/room_member.py | |
| parent | changelog (diff) | |
| parent | Implement RedirectException (#6687) (diff) | |
| download | synapse-107f256cd8c8d72c7a36df7e426aded09c5657c9.tar.xz | |
Merge branch 'develop' into rav/module_api_extensions
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 03bb52ccfb..15e8aa5249 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -690,7 +690,7 @@ class RoomMemberHandler(object): @defer.inlineCallbacks def _get_inviter(self, user_id, room_id): - invite = yield self.store.get_invite_for_user_in_room( + invite = yield self.store.get_invite_for_local_user_in_room( user_id=user_id, room_id=room_id ) if invite: |