diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-07-01 05:27:57 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-07-01 05:27:57 +0000 |
| commit | 639fb604688c85ff270729244a38bf30d5dd6e4a (patch) | |
| tree | 055cea26347801ff00b67b2ae1d11077de73df7b | |
| parent | e23a546f59d789464dcf51b9f0c2bea39b47e390 (diff) | |
| download | redmine-639fb604688c85ff270729244a38bf30d5dd6e4a.tar.gz redmine-639fb604688c85ff270729244a38bf30d5dd6e4a.zip | |
Merged r13198 from trunk to 2.4-stable (#17235)
Prevent "can't modify frozen String" exception when mail sending error.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13202 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -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 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') |