From: Rodney Ewing <ewing.rj@gmail.com>
Date: Sat, 31 Aug 2013 20:45:58 +0000 (-0700)
Subject: didn't remove form.new_email when change email was moved to its own view
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd57c6c5e51a62875542446e0432f850f0239ef8;p=mediagoblin.git

didn't remove form.new_email when change email was moved to its own view
---

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index b09f8c5e..be19bcda 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -237,17 +237,13 @@ def edit_account(request):
 
         user.license_preference = form.license_preference.data
 
-        if form.new_email.data:
-            _update_email(request, form, user)
-
-        if not form.errors:
-            user.save()
-            messages.add_message(request,
-                                 messages.SUCCESS,
-                                 _("Account settings saved"))
-            return redirect(request,
-                            'mediagoblin.user_pages.user_home',
-                            user=user.username)
+        user.save()
+        messages.add_message(request,
+                             messages.SUCCESS,
+                             _("Account settings saved"))
+        return redirect(request,
+                        'mediagoblin.user_pages.user_home',
+                        user=user.username)
 
     return render_to_response(
         request,