diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-05-05 13:07:12 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-05-05 13:07:12 +0000 |
| commit | 7af8d7caf06416a1d9b94f061a6d0b28fc6bc2d9 (patch) | |
| tree | 740ef4bf2bd455d4730e086dc8908515e1b0ad96 /app/controllers/users_controller.rb | |
| parent | e876d1bfc014a51ce5e1178bc57529c37c517c45 (diff) | |
| download | redmine-7af8d7caf06416a1d9b94f061a6d0b28fc6bc2d9.tar.gz redmine-7af8d7caf06416a1d9b94f061a6d0b28fc6bc2d9.zip | |
replace Mailer deliver syntax to Rails3 style
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9638 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 44aa41037..3b42e7e54 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -99,7 +99,7 @@ class UsersController < ApplicationController @user.pref.save @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) - Mailer.deliver_account_information(@user, params[:user][:password]) if params[:send_information] + Mailer.account_information(@user, params[:user][:password]).deliver if params[:send_information] respond_to do |format| format.html { @@ -146,9 +146,9 @@ class UsersController < ApplicationController @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) if was_activated - Mailer.deliver_account_activated(@user) + Mailer.account_activated(@user).deliver elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil? - Mailer.deliver_account_information(@user, params[:user][:password]) + Mailer.account_information(@user, params[:user][:password]).deliver end respond_to do |format| |