From b9db67073d62b0463452681f85333497990d4752 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 23 Jan 2010 18:30:17 -0600
Subject: [PATCH] Ruby 1.9 fix

Make the previous fixes work under Ruby 1.9
as well.
---
 app/controllers/wiki_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 8a021e44..49c4c04b 100644
--- 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