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