From 5f8bea1d96ef26f9d3e23997648f77c8435dd1e9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 21 Jan 2016 04:49:57 +0000 Subject: [PATCH] Merged r15013 (#21656). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15081 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 15b236c01..60af74fba 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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? -- 2.39.5