Use 1.8.7 compatible @Pathname#to_s@ alias for @Pathname#to_path@.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9969 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/plugins/rfpdf/lib/tcpdf.rb b/lib/plugins/rfpdf/lib/tcpdf.rb
index 7c4d0df816fadbf9ecd17cedc3550227d40d76a9..287e81bb777599dcc4a1f77c0d8f34dfb3797ea9 100755 (executable)
--- 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').to_path
+  @@k_path_cache = Rails.root.join('tmp').to_s
   
   cattr_accessor :k_path_url_cache
-  @@k_path_url_cache = Rails.root.join('tmp').to_path
+  @@k_path_url_cache = Rails.root.join('tmp').to_s
   
   cattr_accessor :decoder
                

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index f6988db79bda65b97ec2f22ebdfd7234a679eca6..899411a53bf28d1c42903f5aafc50e78117a6aea 100644 (file)
--- 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').to_path
+          @@k_path_cache = Rails.root.join('tmp', 'pdf').to_s
           FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
           set_language_if_valid lang
           pdf_encoding = l(:general_pdf_encoding).upcase