diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-12 16:30:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-12 16:30:02 +0000 |
| commit | 018b504f5b6708d625e75683ec1ee3b153c80e61 (patch) | |
| tree | 12f644acd333ecf2f02436728b42647614afb86b /synapse/handlers/room.py | |
| parent | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster (diff) | |
| parent | Fix missing profile data in federation joins (diff) | |
| download | synapse-018b504f5b6708d625e75683ec1ee3b153c80e61.tar.xz | |
Merge pull request #368 from matrix-org/erikj/fix_federation_profile
Fix missing profile data in federation joins
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 0266926fc7..3f04752581 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -504,7 +504,8 @@ class RoomMemberHandler(BaseHandler): yield handler.do_invite_join( room_hosts, room_id, - event.user_id + event.user_id, + event.content, ) else: logger.debug("Doing normal join") |