From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 28 Jan 2017 05:43:33 +0000 (+0000)
Subject: unify duplicate codes (#24616)
X-Git-Tag: 3.4.0~342
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=281bc5c454411e72f6ce934de7cbf1ca5192d35e;p=redmine.git

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 bb1f972d4..bd4803b70 100644
--- 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