diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
| commit | 2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch) | |
| tree | 8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /synapse/storage/registration.py | |
| parent | Write a default log_config when generating config (diff) | |
| parent | Add get_rooms_for_user cache (diff) | |
| download | synapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz | |
Merge branch 'develop' into markjh/config_cleanup
Conflicts: synapse/config/captcha.py
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 a986c4816e..026ba217d6 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -181,7 +181,7 @@ class RegistrationStore(SQLBaseStore): @defer.inlineCallbacks def user_add_threepid(self, user_id, medium, address, validated_at, added_at): yield self._simple_upsert("user_threepids", { - "user": user_id, + "user_id": user_id, "medium": medium, "address": address, }, { @@ -193,7 +193,7 @@ class RegistrationStore(SQLBaseStore): def user_get_threepids(self, user_id): ret = yield self._simple_select_list( "user_threepids", { - "user": user_id + "user_id": user_id }, ['medium', 'address', 'validated_at', 'added_at'], 'user_get_threepids' |