diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-04-17 19:36:29 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-04-17 19:36:29 +0000 |
| commit | f155a1ada6e2d28732d3c231e0db3f291e8d01cc (patch) | |
| tree | d30c15d2d4c31ff621f138c5305e5621fbe65ea5 | |
| parent | ebe3a916bcc270cb52cff72739b82fc1946d9849 (diff) | |
| download | redmine-f155a1ada6e2d28732d3c231e0db3f291e8d01cc.tar.gz redmine-f155a1ada6e2d28732d3c231e0db3f291e8d01cc.zip | |
Merged r13101 from trunk to 2.5-stable (#16711)
fix non-ascii attachment file name get corrupted in IE11.
Contributed by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13102 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 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? |