summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-07-01 03:52:27 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-07-01 03:52:27 +0000
commitcb7b57815e3a3e2443a3f5775d39b884f9ccbd11 (patch)
treefffc301214698b383bfd6f503e2345ab248db2f6 /app
parent351b1f637319b631c99354026c0958762473f457 (diff)
downloadredmine-cb7b57815e3a3e2443a3f5775d39b884f9ccbd11.tar.gz
redmine-cb7b57815e3a3e2443a3f5775d39b884f9ccbd11.zip
prevent "can't modify frozen String" exception when mail sending error (#17235)
git-svn-id: http://svn.redmine.org/redmine/trunk@13198 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-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 665c07d6d..c2d464d42 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, Redmine::CodesetUtil.replace_invalid_utf8(e.message))
+ flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))
end
ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
redirect_to settings_path(:tab => 'notifications')