From 6ecd90e7ff5cba5c6976062ed01d213a5b46cdfd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 12 Jul 2013 20:16:59 +0000 Subject: [PATCH] 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 --- app/controllers/admin_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- 2.39.5