OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs

pull/759/head
David Baker 2016-04-29 20:28:47 +01:00
parent b084e4d963 56aae0eaf5
commit 2df75de505
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/rest/client/v2_alpha/account.py
View File

@ -52,6 +52,7 @@ class PasswordRestServlet(RestServlet):
defer.returnValue((401, result)) defer.returnValue((401, result))
user_id = None user_id = None
requester = None
if LoginType.PASSWORD in result: if LoginType.PASSWORD in result:
# if using password, they should also be logged in # if using password, they should also be logged in