Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0c10980efa7059886f73550309d0934f2b509acd..9a1d89da6222213eef1c55108adcdd77b27e4807 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -74,6 +74,8 @@ class UserController < ApplicationController
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass

+        user.pass_crypt_confirmation = pass
+        user.active = true

         user.save
         Notifier::deliver_reset_password(user, pass)
         flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
         user.save
         Notifier::deliver_reset_password(user, pass)
         flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"