Reverse order of sanity checks: check email_verified after making sure there's a user in the request.

This commit is contained in:
Aaron Williamson 2011-10-03 20:28:48 -04:00
parent 7903a14f98
commit 2fe6991660

View File

@ -196,14 +196,6 @@ def resend_activation(request):
Resend the activation email.
"""
if request.user["email_verified"]:
messages.add_message(
request,
messages.ERROR,
_("You've already verified your email address!"))
return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
if request.user is None:
messages.add_message(
request,
@ -212,6 +204,14 @@ def resend_activation(request):
return redirect(request, "/auth/login")
if request.user["email_verified"]:
messages.add_message(
request,
messages.ERROR,
_("You've already verified your email address!"))
return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
request.user[u'verification_key'] = unicode(uuid.uuid4())
request.user.save()