diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
commit | 81391fa162d6f04771b535ace95e53e2d1b45777 (patch) | |
tree | 7ad6e0ff6be63bed9cf9d69408378ba69e04e1cc /synapse/handlers/set_password.py | |
parent | Remove unnecessary condition (diff) | |
parent | Merge pull request #2766 from matrix-org/rav/room_event (diff) | |
download | synapse-81391fa162d6f04771b535ace95e53e2d1b45777.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor
Diffstat (limited to 'synapse/handlers/set_password.py')
-rw-r--r-- | synapse/handlers/set_password.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/set_password.py b/synapse/handlers/set_password.py index 44414e1dc1..e057ae54c9 100644 --- a/synapse/handlers/set_password.py +++ b/synapse/handlers/set_password.py @@ -31,7 +31,7 @@ class SetPasswordHandler(BaseHandler): @defer.inlineCallbacks def set_password(self, user_id, newpassword, requester=None): - password_hash = self._auth_handler.hash(newpassword) + password_hash = yield self._auth_handler.hash(newpassword) except_device_id = requester.device_id if requester else None except_access_token_id = requester.access_token_id if requester else None |