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

2016-04-29 20:28:47 +01:00
parent b084e4d963 56aae0eaf5
commit 2df75de505
1 changed files with 1 additions and 0 deletions
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -52,6 +52,7 @@ class PasswordRestServlet(RestServlet):
            defer.returnValue((401, result))

        user_id = None
+        requester = None

        if LoginType.PASSWORD in result:
            # if using password, they should also be logged in