From 45f870cb53ea701a564e1db7b14733397548f628 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jan 2013 22:34:00 +0000
Subject: [PATCH] Encoding::InvalidByteSequenceError may be raised even if
 encoding is valid (#12787).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11178 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/codeset_util.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb
index 41ea85153..33fe88bd7 100644
--- a/lib/redmine/codeset_util.rb
+++ b/lib/redmine/codeset_util.rb
@@ -104,8 +104,10 @@ module Redmine
       encodings.each do |encoding|
         if str.respond_to?(:force_encoding)
           str.force_encoding(encoding)
-          if str.valid_encoding?
+          begin
             return str.encode('UTF-8')
+          rescue Encoding::InvalidByteSequenceError
+            # do nothing here and try the next encoding
           end
         else
           begin