Merged r15013 (#21656).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15081 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-01-21 04:49:57 +00:00
parent e1cabd14f4
commit 5f8bea1d96

View File

@@ -609,7 +609,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|Trident)} ? ERB::Util.url_encode(name) : name
request.env['HTTP_USER_AGENT'] =~ %r{(MSIE|Trident|Edge)} ? ERB::Util.url_encode(name) : name
end
def api_request?