Merge branch 'master' into devel-1.6.1

This commit is contained in:
Karel Picman 2017-11-28 14:35:02 +01:00
commit 8b2530cc1f

View File

@ -252,7 +252,7 @@ class DmsfFileRevision < ActiveRecord::Base
end
def copy_file_content(open_file)
File.open(self.disk_file, 'wb') do |f|
File.open(self.disk_file(false), 'wb') do |f|
while (buffer = open_file.read(8192))
f.write(buffer)
end