summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 10:16:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 10:16:35 +0000
commit48cea251cf1c6a9ea33181fbc1a48cba12118333 (patch)
tree67a5cd54b105fe73d6a562665d0a372e0e47347d /synapse/handlers/register.py
parentDocker packaging should not su-exec or chmod if already running as UID/GID (#... (diff)
parentEnsure the list media admin API is always available (#5966) (diff)
downloadsynapse-48cea251cf1c6a9ea33181fbc1a48cba12118333.tar.xz
Ensure the list media admin API is always available (#5966)
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 98950b9628..d8db3445ca 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -470,7 +470,6 @@ class RegistrationHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def _join_user_to_room(self, requester, room_identifier):
-        room_id = None
         room_member_handler = self.hs.get_room_member_handler()
         if RoomID.is_valid(room_identifier):
             room_id = room_identifier
@@ -755,8 +754,7 @@ class RegistrationHandler(BaseHandler):
         Args:
             user_id (str): id of user
             threepid (object): m.login.msisdn auth response
-            token (str): access_token for the user
-            bind_email (bool): true if the client requested the email to be
+            bind_msisdn (bool): true if the client requested the msisdn to be
                 bound at the identity server
         Returns:
             defer.Deferred: