scm: to_utf8() in repositories_helper always returns UTF-8 in Ruby 1.9.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-19 05:46:25 +00:00
parent a9d089dbcb
commit e6e4256ee4
2 changed files with 28 additions and 2 deletions
@@ -117,7 +117,16 @@ module RepositoriesHelper
  end

  def to_utf8(str)
-    return str if str.nil? 
+    return str if str.nil?
+    str = to_utf8_internal(str)
+    if str.respond_to?(:force_encoding)
+      str.force_encoding('UTF-8')
+    end
+    str
+  end
+
+  def to_utf8_internal(str)
+    return str if str.nil?
    if str.respond_to?(:force_encoding)
      str.force_encoding('ASCII-8BIT')
    end
@@ -136,6 +145,7 @@ module RepositoriesHelper
    end
    str = replace_invalid_utf8(str)
  end
+  private :to_utf8_internal

  def replace_invalid_utf8(str)
    if str.respond_to?(:force_encoding)