[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 8210951e32b784fdfbe43cc5a3034da40cd783c7
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Jan 19 17:28:43 2012 +0100

    Output pdf in RAILS_CACHE, not in Rails.root/tmp. (Closes: #656329)

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 9ecf594..e31f05d 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -1,7 +1,7 @@
 Description: FHS through env vars
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2010-01-10
+Last-Update: 2012-01-19
 --- a/app/models/attachment.rb
 +++ b/app/models/attachment.rb
 @@ -44,7 +44,7 @@
@@ -93,3 +93,14 @@ Last-Update: 2010-01-10
          if File.file?(deprecated_email_conf)
            warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting."
            @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
+--- a/lib/redmine/export/pdf.rb
++++ b/lib/redmine/export/pdf.rb
+@@ -35,7 +35,7 @@
+         attr_accessor :footer_date
+ 
+         def initialize(lang)
+-          @@k_path_cache = Rails.root.join('tmp', 'pdf')
++          @@k_path_cache = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], 'pdf') : Rails.root.join('tmp', 'pdf')
+           FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
+           set_language_if_valid lang
+           pdf_encoding = l(:general_pdf_encoding).upcase

-- 
redmine.git