summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-15 15:38:29 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-15 15:38:29 +0100
commit2c00e1ecd9774463d687559d5df38b2a76340b32 (patch)
tree2da20ea3c6a7b030568244ec8d876f9389b601fb /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into registration-api... (diff)
downloadsynapse-2c00e1ecd9774463d687559d5df38b2a76340b32.tar.xz
Be consistent when associating keys with login types for registration/login.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/register.py b/synapse/rest/register.py

index fe8f0ed23f..c2c80e70c7 100644 --- a/synapse/rest/register.py +++ b/synapse/rest/register.py
@@ -192,7 +192,7 @@ class RegisterRestServlet(RestServlet): raise SynapseError(400, "Captcha is required.") password = register_json["password"].encode("utf-8") - desired_user_id = (register_json["user_id"].encode("utf-8") if "user_id" + desired_user_id = (register_json["user"].encode("utf-8") if "user" in register_json else None) if desired_user_id and urllib.quote(desired_user_id) != desired_user_id: raise SynapseError(