diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-04-17 18:21:23 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-04-17 18:21:23 +0000 |
commit | 709211cb9cc110babfb56e43491ea0dafe9d69b0 (patch) | |
tree | 8c750f0fc65d833df07c7d41f6fca7647a313b0b /app/controllers | |
parent | 9eb7f259183e22f7e9e1d51597b5ecee4bc90e4f (diff) | |
download | redmine-709211cb9cc110babfb56e43491ea0dafe9d69b0.tar.gz redmine-709211cb9cc110babfb56e43491ea0dafe9d69b0.zip |
fix non-ascii attachment file name get corrupted in IE11 (#16711)
Contributed by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@13101 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-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 b979044f8..8b7bff553 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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? |