diff options
| author | David Baker <dave@matrix.org> | 2016-04-29 20:28:47 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-29 20:28:47 +0100 |
| commit | 2df75de505ffe32b8d45fcb0b34b5e0cac9b2fd0 (patch) | |
| tree | 1888ccebfc841a4d7f0abb65db2fe2df502ad4cd /synapse/rest/client | |
| parent | Add constant for throttle multiplier (diff) | |
| parent | Merge pull request #758 from matrix-org/dbkr/fix_password_reset (diff) | |
| download | synapse-2df75de505ffe32b8d45fcb0b34b5e0cac9b2fd0.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 7f8a6a4cf7..c88c270537 100644 --- 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 |