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

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 0448deca2eb5315838a701ee3f39e7710253a10e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 14 20:40:55 2012 +0200

    Update FHS plugins assets patch to Redmine 2.1

diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
index e09011a..024162a 100644
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ b/debian/patches/2004_FHS_plugins_assets.patch
@@ -1,17 +1,11 @@
-Description: FHS plugins assets
- Engines plugin writes to /usr/share/redmine/public/plugin_assets by default.
- Instead, use per-instance cache directory.
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Bug-Debian: http://bugs.debian.org/570308
-Last-Update: 2010-02-18
---- a/config/environment.rb
-+++ b/config/environment.rb
-@@ -36,6 +36,7 @@
- # Load Engine plugin if available
- begin
-   require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
-+  Engines::public_directory = "#{ENV['RAILS_CACHE']}/plugin_assets"
- rescue LoadError
-   # Not available
- end
+--- a/lib/redmine/plugin.rb
++++ b/lib/redmine/plugin.rb
+@@ -47,7 +47,7 @@ module Redmine #:nodoc:
+     self.directory = File.join(Rails.root, 'plugins')
+ 
+     cattr_accessor :public_directory
+-    self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
++    self.public_directory = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets')
+ 
+     @registered_plugins = {}
+     class << self

-- 
redmine.git