Allow a user's email address to be marked invalid, and suppress most

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f2378f36d33caea9ec49fc34421ed3529637cb3f..35b88b65a97f4580840dd4b9aaa4adae5867a13c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -92,6 +92,7 @@ class UserController < ApplicationController
         user.pass_crypt = pass
         user.pass_crypt_confirmation = pass
         user.active = true
+        user.email_valid = true
         user.save!
         token.destroy
         Notifier::deliver_reset_password(user, pass)
@@ -151,6 +152,7 @@ class UserController < ApplicationController
       if token and !token.user.active?
         @user = token.user
         @user.active = true
+        @user.email_valid = true
         @user.save!
         token.destroy
         flash[:notice] = 'Confirmed your account, thanks for signing up!'