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

2010-01-23 18:33:22 -06:00 · 2010-01-23 18:33:22 -06:00 · 7a12cdb502
parent a8370d5f45 b9db67073d
commit 7a12cdb502
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@ -459,7 +459,7 @@ EOL
        end
        dir = Rails.root.join('public')
        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
      files = @web.files_path