jro_apps/redmine Commit - r1039:941f9bf3dd3b

Non-ascii attachement filename fix for IE....

Jean-Philippe Lang -

r1039:941f9bf3dd3b

parent child

Context file:

r1039:941f9bf3dd3b

app/controllers/application.rb +5 0

                 end
                 return tmp
               end
+              # 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
+              end
             end

app/controllers/attachments_controller.rb +1 -1

               def download
                 # images are sent inline
-                send_file @attachment.diskfile, :filename => @attachment.filename,
+                send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                 :type => @attachment.content_type,
                                                 :disposition => (@attachment.image? ? 'inline' : 'attachment')
               rescue

app/controllers/documents_controller.rb +2 -1

               def download
                 @attachment = @document.attachments.find(params[:attachment_id])
                 @attachment.increment_download
-                send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+                send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                                :type => @attachment.content_type
               rescue
                 render_404
               end

app/controllers/versions_controller.rb +2 -1

               def download
                 @attachment = @version.attachments.find(params[:attachment_id])
                 @attachment.increment_download
-                send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+                send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                                :type => @attachment.content_type
               rescue
                 render_404
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages