diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-21 14:28:41 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-21 14:28:41 +0000 |
| commit | 111ae3c2e95843b1506a68541f0a9198a1e8724f (patch) | |
| tree | d563157c47c5be2227863761f8a8dee8ff9f36ad | |
| parent | 4abdc0f225038b889fd3bc6f7d5885a7189b7e2b (diff) | |
| download | redmine-111ae3c2e95843b1506a68541f0a9198a1e8724f.tar.gz redmine-111ae3c2e95843b1506a68541f0a9198a1e8724f.zip | |
scm: prevent diff shows trace if UTF-8 is invalid in Ruby 1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4912 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/repositories_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 50a1ba240..28397c945 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -132,6 +132,10 @@ module RepositoriesHelper # do nothing here and try the next encoding end end + if str.respond_to?(:force_encoding) + str = str.encode("ASCII-8BIT", :invalid => :replace, + :undef => :replace, :replace => '?').encode("UTF-8") + end str end |