diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-12 20:16:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-12 20:16:59 +0000 |
| commit | 6ecd90e7ff5cba5c6976062ed01d213a5b46cdfd (patch) | |
| tree | 0bdf898d42e61f21f3baed5d5370ec5616655002 /app/controllers/admin_controller.rb | |
| parent | 0a4d2affd8f98351571e6b41936e59aa5074a5d8 (diff) | |
| download | redmine-6ecd90e7ff5cba5c6976062ed01d213a5b46cdfd.tar.gz redmine-6ecd90e7ff5cba5c6976062ed01d213a5b46cdfd.zip | |
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
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index f96cf66fb..2cabbd3e1 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -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') |