kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix test failures (#12787) 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11179 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-01-13 00:43:24 +00:00
parent 45f870cb53
commit 58dfbde1ea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/redmine/codeset_util.rb
View File

@ -103,10 +103,11 @@ module Redmine
encodings = Setting.repositories_encodings.split(',').collect(&:strip) encodings = Setting.repositories_encodings.split(',').collect(&:strip)
encodings.each do |encoding| encodings.each do |encoding|
if str.respond_to?(:force_encoding) if str.respond_to?(:force_encoding)
str.force_encoding(encoding)
begin begin
return str.encode('UTF-8') str.force_encoding(encoding)
rescue Encoding::InvalidByteSequenceError utf8 = str.encode('UTF-8')
return utf8 if utf8.valid_encoding?
rescue
# do nothing here and try the next encoding # do nothing here and try the next encoding
end end
else else