diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-03-16 08:04:42 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-03-16 08:04:42 +0000 |
| commit | 338d7ea91d9cdd2ccdacd8092900424581cf7d23 (patch) | |
| tree | a77e19dbe77cc96170df3b7ae6350787f3cb1035 | |
| parent | 73fb7e3427ea0f8ceaf6d39098121c581778b44b (diff) | |
| download | redmine-338d7ea91d9cdd2ccdacd8092900424581cf7d23.tar.gz redmine-338d7ea91d9cdd2ccdacd8092900424581cf7d23.zip | |
Merged r11637 from trunk to 2.3-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.3-stable@11639 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/issues_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 59cff5ec1..b4b15a66e 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -353,7 +353,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 |