summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-15 17:07:47 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-15 17:07:47 +0000
commit661b76615b0ac8078ada58bba032ec6a38e85e4b (patch)
tree1090f968d09fcc1a44c7adc01abb011d84f3414e /synapse/storage
parentChangelog and version bump for v0.12.0-rc2 (diff)
parentAllow users to change which account a 3pid is bound to (diff)
downloadsynapse-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/storage')
-rw-r--r--synapse/storage/registration.py2
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,
         })