jro_apps/redmine Commit - r15913:2e6d3f447bb6

Backported r16285 (#24199)....

Jean-Philippe Lang -

r15913:2e6d3f447bb6

parent child

Context file:

r15913:2e6d3f447bb6

app/controllers/attachments_controller.rb +1 -1

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

app/controllers/repositories_controller.rb +1 -1

                   send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
                   send_type = Redmine::MimeType.of(@path)
                   send_opt[:type] = send_type.to_s if send_type
-                  send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment')
+                  send_opt[:disposition] = 'attachment'
                   send_data @content, send_opt
                 else
                   # Prevent empty lines when displaying a file with Windows style eol

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