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

2010-01-24 22:57:50 -06:00 · 2010-01-24 22:57:50 -06:00 · 50d0e04624
parent 61a52a91e1 d3db9d1229
commit 50d0e04624
1 changed files with 2 additions and 3 deletions
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@ -463,9 +463,8 @@ EOL
        end
      end
      files = @web.files_path
-      Dir.foreach(files) do |f|
-        next if ['.', '..'].include?(f)
-        zip_out.add "files/#{f}", File.join(files, f)
+      Dir["#{files}/**/*"].each do |f|
+        zip_out.add "files#{f.sub(files.to_s,'')}", f
      end
    end
    FileUtils.rm_rf(Dir[@wiki.storage_path.join(file_prefix + '*.zip').to_s])