diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-24 13:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 13:52:41 +0100 |
| commit | d89f8683dc873c97fc8e046b2eec200a9be0230c (patch) | |
| tree | 19e005a8ff177a3d0d6ee6eae0ea5c03e775a047 /synapse/rest/client | |
| parent | Merge pull request #1040 from matrix-org/erikj/pagination (diff) | |
| parent | Remove tracer (diff) | |
| download | synapse-d89f8683dc873c97fc8e046b2eec200a9be0230c.tar.xz | |
Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts
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): |