diff options
| -rw-r--r-- | lib/redmine/codeset_util.rb | 2 | ||||
| -rw-r--r-- | test/unit/lib/redmine/codeset_util_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb index bd4803b70..4f056d54a 100644 --- a/lib/redmine/codeset_util.rb +++ b/lib/redmine/codeset_util.rb @@ -6,7 +6,7 @@ module Redmine return str if str.nil? str.force_encoding('UTF-8') if ! str.valid_encoding? - str = str.encode("US-ASCII", :invalid => :replace, + str = str.encode("UTF-16LE", :invalid => :replace, :undef => :replace, :replace => '?').encode("UTF-8") end str diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb index 35ab0088d..dcfc08bce 100644 --- a/test/unit/lib/redmine/codeset_util_test.rb +++ b/test/unit/lib/redmine/codeset_util_test.rb @@ -91,7 +91,7 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase s2 = Redmine::CodesetUtil.replace_invalid_utf8(s1) assert s2.valid_encoding? assert_equal "UTF-8", s2.encoding.to_s - assert_equal "??????", s2 + assert_equal "\xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1??".force_encoding("UTF-8"), s2 end test "#to_utf8 should replace invalid non utf8" do |