Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-29 10:49:56 +01:00
Code Issues Packages Projects Releases Activity

Fix that AttachmentsController#show don't close the file after reading.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15289 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-04-03 11:41:41 +00:00
parent 05a9275fda
commit 3e1d2c0924
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/attachments_controller.rb
View File

@@ -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