summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-26 13:49:38 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-26 13:49:38 +0100
commit6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71 (patch)
tree22fc258521ec6c2e46c84a1cd579deb2ca8a7cfb /synapse/handlers/register.py
parentMerge pull request #253 from matrix-org/tox (diff)
parentMerge erikj/user_dedup to develop (diff)
downloadsynapse-6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71.tar.xz
Merge pull request #255 from matrix-org/mergeeriksmadness
Merge erikj/user_dedup to develop
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 3d1b6531c2..56d125f753 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -56,8 +56,8 @@ class RegistrationHandler(BaseHandler):
 
         yield self.check_user_id_is_valid(user_id)
 
-        u = yield self.store.get_user_by_id(user_id)
-        if u:
+        users = yield self.store.get_users_by_id_case_insensitive(user_id)
+        if users:
             raise SynapseError(
                 400,
                 "User ID already taken.",