Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-23 21:00:42 +01:00
Code Issues Packages Projects Releases Activity

Merged r13101 from trunk to 2.5-stable (#16711)

Browse Source 
fix non-ascii attachment file name get corrupted in IE11.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13102 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2014-04-17 19:36:29 +00:00
parent ebe3a916bc
commit f155a1ada6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -558,7 +558,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?