From 4fc3834dd6cd4fa4f9297e83fa2c85680d34e498 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 13 Nov 2014 08:50:55 +1100 Subject: [PATCH] FEATURE: allow inline disposition on uploads when linking an upload allow ?inline=1 to display upload inline --- app/controllers/uploads_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index d134c061e0..a8f1dad6f6 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -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