From: Rodney Ewing <ewing.rj@gmail.com>
Date: Fri, 12 Jul 2013 19:27:41 +0000 (-0700)
Subject: check for form.password in the off chance that a user is logged in and the server... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5a6e4e13076afddeeec31259eaee7c5af0defb2d;p=mediagoblin.git

check for form.password in the off chance that a user is logged in and the server switches the authentication method from basic_auth to openid.
---

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 82cec8da..53a63cd0 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -444,7 +444,7 @@ def change_email(request):
                 _('Sorry, a user with that email address'
                     ' already exists.'))
 
-        if user.pw_hash and not auth.check_password(
+        if form.password and user.pw_hash and not auth.check_password(
                 form.password.data, user.pw_hash):
             form.password.errors.append(
                 _('Wrong password'))