From 70bc3fd60187a82b645d5631e3f5e7caebd13f8e Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 17 Apr 2014 19:38:02 +0000 Subject: [PATCH] Merged r13101 from trunk to 2.4-stable (#16711) fix non-ascii attachment file name get corrupted in IE11. Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13103 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8716aae39..beb8926a0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -555,7 +555,7 @@ class ApplicationController < ActionController::Base # Returns a string that can be used as filename value in Content-Disposition header def filename_for_content_disposition(name) - request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name + request.env['HTTP_USER_AGENT'] =~ %r{(MSIE|Trident)} ? ERB::Util.url_encode(name) : name end def api_request? -- 2.39.5