diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 18:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 18:25:23 +0100 |
| commit | beed1ba089fa4aa0aca6ac9ef9c560508197baa4 (patch) | |
| tree | 51b4105de45a5dea15013b90b2692d772599e302 /synapse/storage/registration.py | |
| parent | Remove lie from change log. (diff) | |
| parent | fix SYWEB-41 (hopefully) (diff) | |
| download | synapse-beed1ba089fa4aa0aca6ac9ef9c560508197baa4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index fd762bc643..db20b1daa0 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -62,7 +62,7 @@ class RegistrationStore(SQLBaseStore): Raises: StoreError if the user_id could not be registered. """ - yield self._db_pool.runInteraction(self._register, user_id, token, + yield self.runInteraction(self._register, user_id, token, password_hash) def _register(self, txn, user_id, token, password_hash): @@ -99,7 +99,7 @@ class RegistrationStore(SQLBaseStore): Raises: StoreError if no user was found. """ - user_id = yield self._db_pool.runInteraction(self._query_for_auth, + user_id = yield self.runInteraction(self._query_for_auth, token) defer.returnValue(user_id) |