From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Jan 2016 04:48:28 +0000 (+0000)
Subject: Merged r15013 (#21656).
X-Git-Tag: 3.1.4~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=046437b40c55f04e33163e7de3d5b75882ba437f;p=redmine.git

Merged r15013 (#21656).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15080 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9f307c3e2..173b10627 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -615,7 +615,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?