Merged r11637 from trunk to 2.2-stable (#13354)
PDF: fix incompatible character encodings: UTF-8 and ASCII-8BIT. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11638 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
c2eb28b901
commit
0eaba11e20
|
@ -350,7 +350,10 @@ module IssuesHelper
|
|||
association = Issue.reflect_on_association(field.to_sym)
|
||||
if association
|
||||
record = association.class_name.constantize.find_by_id(id)
|
||||
return record.name if record
|
||||
if record
|
||||
record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
|
||||
return record.name
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue