summaryrefslogtreecommitdiffstats
path: root/redmine/app/helpers/ifpdf_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'redmine/app/helpers/ifpdf_helper.rb')
-rw-r--r--redmine/app/helpers/ifpdf_helper.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/redmine/app/helpers/ifpdf_helper.rb b/redmine/app/helpers/ifpdf_helper.rb
index 4e7a173f4..a0dab0f94 100644
--- a/redmine/app/helpers/ifpdf_helper.rb
+++ b/redmine/app/helpers/ifpdf_helper.rb
@@ -25,12 +25,12 @@ module IfpdfHelper
def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
@ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
- super w,h,@ic.iconv(txt),border,ln,align,fill,link
- end
-
- def MultiCell(w,h,txt,border=0,align='J',fill=0)
- @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
- super w,h,txt,border,align,fill
+ txt = begin
+ @ic.iconv(txt)
+ rescue
+ txt
+ end
+ super w,h,txt,border,ln,align,fill,link
end
def Footer