From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 1 Jul 2014 03:52:27 +0000 (+0000)
Subject: prevent "can't modify frozen String" exception when mail sending error (#17235)
X-Git-Tag: 2.6.0~117
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb7b57815e3a3e2443a3f5775d39b884f9ccbd11;p=redmine.git

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
---

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')