Merge remote-tracking branch 'origin/szzh' into szzh

2015-10-13 17:03:49 +08:00 · 2015-10-13 17:03:49 +08:00 · bd8f2f20a5
parent a227e37598 3a98224f6a
commit bd8f2f20a5
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -756,7 +756,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?