summaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 12:38:34 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 12:38:34 +0000
commitd862843c9d58461fbdaa0f50e8a80197462a01b6 (patch)
treea9665c9ba7cb70cfedb644cb979ba04571271f74 /app/controllers/admin_controller.rb
parent1b923819e8305bfe324c9c59e745f61c9c49ef06 (diff)
downloadredmine-d862843c9d58461fbdaa0f50e8a80197462a01b6.tar.gz
redmine-d862843c9d58461fbdaa0f50e8a80197462a01b6.zip
Renamed Mailer#test to Mailer#test_email.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9080 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
-rw-r--r--app/controllers/admin_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index dd3e91236..9684f5cbf 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -63,7 +63,7 @@ class AdminController < ApplicationController
# Force ActionMailer to raise delivery errors so we can catch it
ActionMailer::Base.raise_delivery_errors = true
begin
- @test = Mailer.deliver_test(User.current)
+ @test = Mailer.deliver_test_email(User.current)
flash[:notice] = l(:notice_email_sent, User.current.mail)
rescue Exception => e
flash[:error] = l(:notice_email_error, e.message)