jro_apps/redmine Commit - r15891:b2c0ea2c3e15

do not replace all invalid utf8 (#24616)...

Toshi MARUYAMA -

r15891:b2c0ea2c3e15

parent child

Context file:

r15891:b2c0ea2c3e15

lib/redmine/codeset_util.rb +1 -1

                    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

test/unit/lib/redmine/codeset_util_test.rb +1 -1

                  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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages