github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 02:19:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: allow inline disposition on uploads

Browse Source 
when linking an upload allow ?inline=1 to display upload inline
This commit is contained in:
Sam 2014-11-13 08:50:55 +11:00
parent 03bc91f204
commit 4fc3834dd6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/uploads_controller.rb
View File

@ -34,7 +34,9 @@ class UploadsController < ApplicationController
# the "url" parameter is here to prevent people from scanning the uploads using the id
if upload = (Upload.find_by(id: id, url: url) || Upload.find_by(sha1: params[:sha]))
send_file(Discourse.store.path_for(upload), filename: upload.original_filename)
opts = {filename: upload.original_filename}
opts[:disposition] = 'inline' if params[:inline]
send_file(Discourse.store.path_for(upload),opts)
else
render_404
end