Merge branch 'develop' into markjh/SYT-8-recaptcha

Conflicts:
	synapse/handlers/auth.py
This commit is contained in:
Mark Haines 2015-05-29 13:49:44 +01:00
commit 784aaa53df
5 changed files with 12 additions and 16 deletions

View file

@ -199,6 +199,7 @@ class AuthHandler(BaseHandler):
# Twisted is silly
data = pde.response
resp_body = simplejson.loads(data)
if 'success' in resp_body and resp_body['success']:
defer.returnValue(True)
raise LoginError(401, "", errcode=Codes.UNAUTHORIZED)