diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-12-15 17:07:47 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-12-15 17:07:47 +0000 |
| commit | 661b76615b0ac8078ada58bba032ec6a38e85e4b (patch) | |
| tree | 1090f968d09fcc1a44c7adc01abb011d84f3414e /synapse | |
| parent | Changelog and version bump for v0.12.0-rc2 (diff) | |
| parent | Allow users to change which account a 3pid is bound to (diff) | |
| download | synapse-661b76615b0ac8078ada58bba032ec6a38e85e4b.tar.xz | |
Merge pull request #445 from matrix-org/markjh/rebind_threepid
Allow users to change which account a 3pid is bound to
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/registration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 2e5eddd259..09a05b08ef 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -258,10 +258,10 @@ 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_id": user_id, "medium": medium, "address": address, }, { + "user_id": user_id, "validated_at": validated_at, "added_at": added_at, }) |