unify duplicate codes (#24616)

git-svn-id: http://svn.redmine.org/redmine/trunk@16272 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb
index bb1f972d4a3b91e54b846472dbe27068f5598eab..bd4803b70cc9ca63bf820ed19f4988043ed9e70c 100644 (file)
--- a/lib/redmine/codeset_util.rb
+++ b/lib/redmine/codeset_util.rb
@@ -25,11 +25,7 @@ module Redmine
         str = str.encode("UTF-8", :invalid => :replace,
               :undef => :replace, :replace => '?')
       else
-        str.force_encoding("UTF-8")
-        if ! str.valid_encoding?
-          str = str.encode("US-ASCII", :invalid => :replace,
-                :undef => :replace, :replace => '?').encode("UTF-8")
-        end
+        str = replace_invalid_utf8(str)
       end
       str
     end