From c1f17037e4b5575be4f9b49589945e4717e6f5ef Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 8 Jun 2014 04:23:59 +0000 Subject: [PATCH] fix variable name confusion at AttachmentsController#thumbnail This is suggested by Rails team. https://github.com/rails/rails/issues/15471#issuecomment-45419147 git-svn-id: http://svn.redmine.org/redmine/trunk@13176 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/attachments_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 18f0e0d9e..b7f856a1a 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -61,9 +61,9 @@ class AttachmentsController < ApplicationController end def thumbnail - if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size]) - if stale?(:etag => thumbnail) - send_file thumbnail, + if @attachment.thumbnailable? && tbnail = @attachment.thumbnail(:size => params[:size]) + if stale?(:etag => tbnail) + send_file tbnail, :filename => filename_for_content_disposition(@attachment.filename), :type => detect_content_type(@attachment), :disposition => 'inline' -- 2.39.5