meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-06 09:03:25 +00:00
Code Issues Releases Wiki Activity

Fix "Couldn't find template for digesting" error in the log when sending an attachment or thumbnail (#20277).

Browse Source 
Patch by Olivier Houdas.


git-svn-id: http://svn.redmine.org/redmine/trunk@19365 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-12-12 14:32:25 +00:00
parent e2ed6f27b6
commit 92232cc602
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/attachments_controller.rb
View File

@ -70,7 +70,7 @@ class AttachmentsController < ApplicationController
@attachment.increment_download
end
if stale?(:etag => @attachment.digest)
if stale?(:etag => @attachment.digest, :template => false)
# images are sent inline
send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => detect_content_type(@attachment),
@ -80,7 +80,7 @@ class AttachmentsController < ApplicationController
def thumbnail
if @attachment.thumbnailable? && tbnail = @attachment.thumbnail(:size => params[:size])
if stale?(:etag => tbnail)
if stale?(:etag => tbnail, :template => false)
send_file(
tbnail,
:filename => filename_for_content_disposition(@attachment.filename),