diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/scm/adapters/abstract_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 1d10abb16..98683b015 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -283,7 +283,7 @@ module Redmine def scm_iconv(to, from, str) return nil if str.nil? - return str if to == from + return str if to == from && str.encoding.to_s == from str.force_encoding(from) begin str.encode(to) |