Exception message may not be UTF-8 encoded.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12009 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-07-12 20:16:59 +00:00
parent 0a4d2affd8
commit 6ecd90e7ff
1 changed files with 1 additions and 1 deletions

View File

@ -65,7 +65,7 @@ class AdminController < ApplicationController
@test = Mailer.test_email(User.current).deliver
flash[:notice] = l(:notice_email_sent, User.current.mail)
rescue Exception => e
flash[:error] = l(:notice_email_error, e.message)
flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message))
end
ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
redirect_to settings_path(:tab => 'notifications')