Commit bd5386b2 authored by jplang's avatar jplang

Make sure that #scm_iconv returns a string with the target encoding (#14534).

filechanges.find_by_revision_and_path fails with SQLite if arguments are not UTF-8 encoded.

git-svn-id: https://svn.redmine.org/redmine/trunk@13902 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e073f3ff
......@@ -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)
......
......@@ -179,6 +179,7 @@ class RepositoryCvsTest < ActiveSupport::TestCase
assert_kind_of Redmine::Scm::Adapters::Entries, entries
assert_equal 3, entries.size
assert_equal entries[2].name, "README"
assert_equal 'UTF-8', entries[2].path.encoding.to_s
assert_equal entries[2].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)
assert_equal entries[2].lastrev.identifier, '3'
assert_equal entries[2].lastrev.revision, '3'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment