deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-01-24 22:57:50 -06:00
parent 61a52a91e1 d3db9d1229
commit 50d0e04624
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/wiki_controller.rb
View file

@ -463,9 +463,8 @@ EOL
end end
end end
files = @web.files_path files = @web.files_path
Dir.foreach(files) do |f| Dir["#{files}/**/*"].each do |f|
next if ['.', '..'].include?(f) zip_out.add "files#{f.sub(files.to_s,'')}", f
zip_out.add "files/#{f}", File.join(files, f)
end end
end end
FileUtils.rm_rf(Dir[@wiki.storage_path.join(file_prefix + '*.zip').to_s]) FileUtils.rm_rf(Dir[@wiki.storage_path.join(file_prefix + '*.zip').to_s])