From 3e1d2c09243b1f61edcc232138db29abc3be7579 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 3 Apr 2016 11:41:41 +0000 Subject: [PATCH] Fix that AttachmentsController#show don't close the file after reading. git-svn-id: http://svn.redmine.org/redmine/trunk@15289 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/attachments_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 6113957d4..a4aea5cf7 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -28,7 +28,7 @@ class AttachmentsController < ApplicationController respond_to do |format| format.html { if @attachment.is_diff? - @diff = File.new(@attachment.diskfile, "rb").read + @diff = File.read(@attachment.diskfile, :mode => "rb") @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) # Save diff type as user preference @@ -38,7 +38,7 @@ class AttachmentsController < ApplicationController end render :action => 'diff' elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte - @content = File.new(@attachment.diskfile, "rb").read + @content = File.read(@attachment.diskfile, :mode => "rb") render :action => 'file' else download -- 2.39.5