summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-12 16:19:55 +0000
committerErik Johnston <erik@matrix.org>2015-11-12 16:19:55 +0000
commitc0b3554401b821002acfc3989e57d6ac59671aa9 (patch)
tree040464e3e653531e8b2d03ffb1efb64b3dab0f9a /synapse/handlers/room.py
parentFix an issue with ignoring power_level changes on divergent graphs (diff)
downloadsynapse-c0b3554401b821002acfc3989e57d6ac59671aa9.tar.xz
Fix missing profile data in federation joins
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py3
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")