##// END OF EJS Templates
Merged r13198 from trunk to 2.5-stable (#17235)...
Toshi MARUYAMA -
r12925:5ecad330d95f
parent child
Show More
@@ -65,7 +65,7 class AdminController < ApplicationController
65 @test = Mailer.test_email(User.current).deliver
65 @test = Mailer.test_email(User.current).deliver
66 flash[:notice] = l(:notice_email_sent, User.current.mail)
66 flash[:notice] = l(:notice_email_sent, User.current.mail)
67 rescue Exception => e
67 rescue Exception => e
68 flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message))
68 flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))
69 end
69 end
70 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
70 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
71 redirect_to settings_path(:tab => 'notifications')
71 redirect_to settings_path(:tab => 'notifications')
General Comments 0
You need to be logged in to leave comments. Login now