Merge branch 'hotfix/0.2.17'

2013-11-25 00:15:25 +01:00 · 2013-11-25 00:15:25 +01:00 · 8c5aacd66f
commit 8c5aacd66f
parent 3fe459dd8d f000503d79
1 changed files with 4 additions and 3 deletions
--- a/account/views.py
+++ b/account/views.py
@ -40,11 +40,12 @@ def landingpage(request):
        try:
            user = User.objects.get(username=check_nickname)
            check_nickname = True
+        except:
+            check_nickname = False
+
    # output as text if requested
    if request.GET.get('raw', ''):
        return HttpResponse(check_nickname)
-        except:
-            check_nickname = False

    return render(request, 'base.html', locals())