From 6603e39e6a643223b9659331c5d0724aad09d50b Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 27 Oct 2014 11:58:23 +0000
Subject: [PATCH] Fix SYWEB-109 : No error if HS rejects the username in
 registration.

Display all error messages from the server when registering, rather
than just the types of errors the client recognises.
---
 webclient/login/register-controller.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js
index b3c0c21335..be970ce1c3 100644
--- a/webclient/login/register-controller.js
+++ b/webclient/login/register-controller.js
@@ -140,6 +140,9 @@ angular.module('RegisterController', ['matrixService'])
                         $scope.feedback = "Captcha is required on this home " +
                                           "server.";
                     }
+                    else if (error.data.error) {
+                        $scope.feedback = error.data.error;
+                    }
                 }
                 else if (error.status === 0) {
                     $scope.feedback = "Unable to talk to the server.";