jro_apps/redmine Commit - r14907:3e1d2c09243b

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

Jean-Philippe Lang -

r14907:3e1d2c09243b

parent child

Context file:

r14907:3e1d2c09243b

app/controllers/attachments_controller.rb +2 -2

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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages