aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-08-11 22:44:21 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-08-11 22:44:21 -0500
commite7f518cc9478c8387846a27599288c7aed0a9637 (patch)
treeda6e4cb90fb4a0b434f1e821611cb15c696ebe6f
parent01360fbd98a8830a27cf4301ec5c4bc180208909 (diff)
parentd88e1d15c7c4903a696830155527f70e33b88c72 (diff)
downloadmediagoblin-e7f518cc9478c8387846a27599288c7aed0a9637.tar.lz
mediagoblin-e7f518cc9478c8387846a27599288c7aed0a9637.tar.xz
mediagoblin-e7f518cc9478c8387846a27599288c7aed0a9637.zip
Merge remote branch 'remotes/gullydwarf-cfdv/b488_email_validation_assumes_active_login'
-rw-r--r--mediagoblin/auth/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index ce6b5dfc..55f42141 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -166,7 +166,7 @@ def verify_email(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
- user=request.user['username'])
+ user = user['username'])
def resend_activation(request):