Fixes RepositoriesHelper#to_utf8 test failure for ruby1.8.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5169 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes RepositoriesHelper#to_utf8 test failure for ruby1.8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5169 e93f8b46-1217-0410-a6f0-8f06a7374b81
af40f867 · Jean-Philippe Lang · Eric Davis · 8a0574ac · af40f867
Commit af40f867 authored Mar 20, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

repositories_helper.rb app/helpers/repositories_helper.rb +7 -0

No files found.
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -154,6 +154,13 @@ module RepositoriesHelper
        str = str.encode("US-ASCII", :invalid => :replace,
              :undef => :replace, :replace => '?').encode("UTF-8")
      end
+    else
+      # removes invalid UTF8 sequences
+      begin
+        str = Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
+      rescue Iconv::InvalidEncoding
+        # "UTF-8//IGNORE" is not supported on some OS
+      end
    end
    str
  end