From c929ab5c1663374d683b784c92b8cde731f57ae8 Mon Sep 17 00:00:00 2001 From: Etienne Massip Date: Tue, 10 Jul 2012 19:53:03 +0000 Subject: [PATCH] Set temporary path cache variable as a String back again so that TCPDF handles error messages fine. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9968 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/plugins/rfpdf/lib/tcpdf.rb | 4 ++-- lib/redmine/export/pdf.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/plugins/rfpdf/lib/tcpdf.rb b/lib/plugins/rfpdf/lib/tcpdf.rb index 56ae756e1..7c4d0df81 100755 --- a/lib/plugins/rfpdf/lib/tcpdf.rb +++ b/lib/plugins/rfpdf/lib/tcpdf.rb @@ -86,10 +86,10 @@ class TCPDF @@k_small_ratio = 2/3.0 cattr_accessor :k_path_cache - @@k_path_cache = Rails.root.join('tmp') + @@k_path_cache = Rails.root.join('tmp').to_path cattr_accessor :k_path_url_cache - @@k_path_url_cache = Rails.root.join('tmp') + @@k_path_url_cache = Rails.root.join('tmp').to_path cattr_accessor :decoder diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 466b0ccac..f6988db79 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -36,7 +36,7 @@ module Redmine attr_accessor :footer_date def initialize(lang) - @@k_path_cache = Rails.root.join('tmp', 'pdf') + @@k_path_cache = Rails.root.join('tmp', 'pdf').to_path FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) set_language_if_valid lang pdf_encoding = l(:general_pdf_encoding).upcase -- 2.39.5