github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: pull hotlinked images even when they have no extension

Browse Source
This commit is contained in:
Régis Hanol
2017-06-13 13:27:05 +02:00
parent a5d3abc9b6
commit 5d63a7f4a6
7 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/uploads_controller.rb
View File

@ -1,3 +1,4 @@
require "mini_mime"
require_dependency 'upload_creator'
class UploadsController < ApplicationController
@ -42,7 +43,7 @@ class UploadsController < ApplicationController
if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
opts = {
filename: upload.original_filename,
content_type: Rack::Mime.mime_type(File.extname(upload.original_filename)),
content_type: MiniMime.lookup_by_filename(upload.original_filename)&.content_type,
}
opts[:disposition] = "inline" if params[:inline]
opts[:disposition] ||= "attachment" unless FileHelper.is_image?(upload.original_filename)