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

This commit is contained in:
Jacques Distler 2010-01-23 18:33:22 -06:00
commit 7a12cdb502

View file

@ -459,7 +459,7 @@ EOL
end end
dir = Rails.root.join('public') dir = Rails.root.join('public')
Dir["#{dir}/**/*"].each do |f| Dir["#{dir}/**/*"].each do |f|
zip_out.add "public#{f.sub(dir,'')}", f zip_out.add "public#{f.sub(dir.to_s,'')}", f
end end
end end
files = @web.files_path files = @web.files_path