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
This commit is contained in:
Toshi MARUYAMA
2014-04-17 19:38:02 +00:00
parent 3b91ec2246
commit 70bc3fd601

View File

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