diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-21 04:48:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-01-21 04:48:28 +0000 |
| commit | 046437b40c55f04e33163e7de3d5b75882ba437f (patch) | |
| tree | c2351a008eb8f223c21f5cdc98b37765b59dd48b | |
| parent | 5418d48478f27e85649fc1f645a4087a0c27d824 (diff) | |
| download | redmine-046437b40c55f04e33163e7de3d5b75882ba437f.tar.gz redmine-046437b40c55f04e33163e7de3d5b75882ba437f.zip | |
Merged r15013 (#21656).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15080 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |