diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
| commit | 94e605237512daa518bcab9b59edbc1107840006 (patch) | |
| tree | eb1aa0b714c536f68474f0853c251ed4c5d683cf /mediagoblin/auth/views.py | |
| parent | bf0f67ad6547e2073770942ddf66f23d3181831a (diff) | |
| parent | 54477b4d76ca983e2e884fea9c0975c7e63fdc1d (diff) | |
| download | mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.lz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.xz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.zip | |
Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/auth/views.py')
| -rw-r--r-- | mediagoblin/auth/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index e18469b9..46c937b0 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -120,7 +120,7 @@ def login(request): login_failed = False if request.method == 'POST' and login_form.validate(): - user = request.db.User.one( + user = request.db.User.find_one( {'username': request.POST['username'].lower()}) if user and user.check_login(request.POST['password']): |