Merge erikj/user_dedup to develop

This commit is contained in:
Daniel Wagner-Hall 2015-08-26 13:42:45 +01:00
parent a2355fae7e
commit d3c0e48859
4 changed files with 50 additions and 12 deletions

View file

@ -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.",