summary refs log tree commit diff
path: root/synapse/storage/registration.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-16 11:18:45 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-16 11:18:45 +0000
commit4fab578b434814cd283fe77bb62b2b8a771aac92 (patch)
tree08720e856f92728987fc56a18c67b46ed3667ea6 /synapse/storage/registration.py
parentMerge pull request #443 from matrix-org/markjh/commentary (diff)
parentMerge pull request #445 from matrix-org/markjh/rebind_threepid (diff)
downloadsynapse-4fab578b434814cd283fe77bb62b2b8a771aac92.tar.xz
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'synapse/storage/registration.py')
-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,
         })