diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-23 15:23:39 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-24 11:58:40 +0100 |
commit | 921913935176f5bd3df5e5b960d87c94a2adb304 (patch) | |
tree | ccb7c2bddbad96b35fcb0de89b562ed0a4115a67 /synapse/rest/client | |
parent | Merge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff) | |
download | synapse-921913935176f5bd3df5e5b960d87c94a2adb304.tar.xz |
Preserve some logcontexts
Diffstat (limited to 'synapse/rest/client')
-rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 943f5676a3..2121bd75ea 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -403,10 +403,9 @@ class RegisterRestServlet(RestServlet): # register the user's device device_id = params.get("device_id") initial_display_name = params.get("initial_device_display_name") - device_id = self.device_handler.check_device_registered( + return self.device_handler.check_device_registered( user_id, device_id, initial_display_name ) - return device_id @defer.inlineCallbacks def _do_guest_registration(self): |