Merge branch 'master' into mobile_interface

[bluechips.git] / bluechips / controllers / user.py

diff --git a/bluechips/controllers/user.py b/bluechips/controllers/user.py
index b710a6c07e6cc4c2bc4b202f6938dc9fe45df8da..b432126a15d587acb64f0fcfa4d88e8f4c975e46 100644 (file)
--- a/bluechips/controllers/user.py
+++ b/bluechips/controllers/user.py
@@ -11,6 +11,7 @@ from sqlalchemy import orm
 
 from pylons import request
 from pylons.decorators import validate
+from pylons.decorators.secure import authenticate_form
 
 from formencode import validators, Schema
 
@@ -28,11 +29,10 @@ class UserController(BaseController):
         c.title = 'User Settings'
         return render('/user/index.mako')
 
+    @authenticate_form
     @validate(schema=EmailSchema(), form='index')
     def update(self):
         new_email = self.form_result['new_email']
-        if new_email == '':
-            new_email = None
         request.environ['user'].email = new_email
         meta.Session.commit()
         if new_email is None: