PDF: replace invalid sequence in converting if encoding destination is UTF-8 (#61, #8312).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5715 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-09 06:45:40 +00:00
parent a5d528c6c2
commit e25dd95389
2 changed files with 46 additions and 2 deletions
@@ -455,8 +455,12 @@ module Redmine
          txt ||= ''
          if txt.respond_to?(:force_encoding)
            txt.force_encoding('UTF-8')
-            txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace,
-                              :undef => :replace, :replace => '?')
+            if l(:general_pdf_encoding).upcase != 'UTF-8'
+              txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace,
+                               :undef => :replace, :replace => '?')
+            else
+              txt = Redmine::CodesetUtil.replace_invalid_utf8(txt)
+            end
            txt.force_encoding('ASCII-8BIT')
          else
            ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')