diff options
| -rw-r--r-- | app/models/changeset.rb | 2 | ||||
| -rw-r--r-- | app/models/repository/cvs.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 9b8ac5d70..0bc35a7f1 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -252,8 +252,6 @@ class Changeset < ActiveRecord::Base Changeset.to_utf8(str.to_s.strip, encoding) end - private - def self.to_utf8(str, encoding) return str if str.nil? str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding) diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index 4112f3ecd..a0202f19b 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -137,11 +137,12 @@ class Repository::Cvs < Repository revision.paths[0][:revision] ) cmt = Changeset.normalize_comments(revision.message, repo_log_encoding) + author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding) cs = changesets.find( :first, :conditions => { :committed_on => tmp_time - time_delta .. tmp_time + time_delta, - :committer => revision.author, + :committer => author_utf8, :comments => cmt } ) |