From 5ecad330d95f7d3073f633b9cb8ee597fd4c5877 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 1 Jul 2014 05:25:07 +0000 Subject: [PATCH] Merged r13198 from trunk to 2.5-stable (#17235) Prevent "can't modify frozen String" exception when mail sending error. git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13200 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 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') -- 2.39.5