jro_apps/redmine Commit - r10525:5a2c80cb48c4

use String#encode at scm_iconv on Ruby 1.9 (#12228)...

Toshi MARUYAMA -

r10525:5a2c80cb48c4

parent child

Context file:

r10525:5a2c80cb48c4

lib/redmine/scm/adapters/abstract_adapter.rb +15 -5

                      def scm_iconv(to, from, str)
                        return nil if str.nil?
                        return str if to == from
-                       begin
-                         Iconv.conv(to, from, str)
-                       rescue Iconv::Failure => err
-                         logger.error("failed to convert from #{from} to #{to}. #{err}")
-                         nil
+                       if str.respond_to?(:force_encoding)
+                         str.force_encoding(from)
+                         begin
+                           s = str.encode(to)
+                         rescue Exception => e
+                           logger.error("failed to convert from #{from} to #{to}. #{err}")
+                           nil
+                         end
+                       else
+                         begin
+                           Iconv.conv(to, from, str)
+                         rescue Iconv::Failure => err
+                           logger.error("failed to convert from #{from} to #{to}. #{err}")
+                           nil
+                         end
                        end
                      end

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