summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-15 17:02:21 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-15 17:02:21 +0000
commitdcfc70e8ed263256b2a3cf59e7d21e54f39fc287 (patch)
tree1090f968d09fcc1a44c7adc01abb011d84f3414e /synapse/storage
parentChangelog and version bump for v0.12.0-rc2 (diff)
downloadsynapse-dcfc70e8ed263256b2a3cf59e7d21e54f39fc287.tar.xz
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,
         })