From 3691ae16b57aa15e28d27d24c301d39f12f2a476 Mon Sep 17 00:00:00 2001
From: Saito <saitowu@gmail.com>
Date: Tue, 6 Nov 2012 17:00:00 +0800
Subject: [PATCH] fix path join Encoding problem

---
 app/helpers/tree_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 0f2b695e0ad..9244b4fbc34 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -57,7 +57,7 @@ module TreeHelper
 
   # Simple shortcut to File.join
   def tree_join(*args)
-    File.join(*args)
+    File.join(*args.map{|argument| argument.dup.force_encoding('UTF-8')})
   end
 
   def allowed_tree_edit?
-- 
GitLab