[DRE-commits] r5291 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-05-12 15:27:47 +0000 (Wed, 12 May 2010)
New Revision: 5291

Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
Log:
RAILS_RELATIVE_URL_ROOT must not be empty, previous test checked if set only.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-05-12 12:35:34 UTC (rev 5290)
+++ trunk/redmine/debian/changelog	2010-05-12 15:27:47 UTC (rev 5291)
@@ -1,3 +1,10 @@
+redmine (0.9.4-2) unstable; urgency=low
+
+  * ENV['RAILS_RELATIVE_URL_ROOT'] should never be empty.
+    (Closes: #581383)
+
+ -- Jérémy Lal <kapouer at melix.org>  Wed, 12 May 2010 17:25:00 +0200
+
 redmine (0.9.4-1) unstable; urgency=low
 
   * New upstream release. 

Modified: trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
===================================================================
--- trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-05-12 12:35:34 UTC (rev 5290)
+++ trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-05-12 15:27:47 UTC (rev 5291)
@@ -20,7 +20,7 @@
 +ActionController::Base.session = {
 +  :session_key => sessionconfig[Rails.env]['session_key'],
 +  :secret => sessionconfig[Rails.env]['secret'],
-+  :session_path => ENV['RAILS_RELATIVE_URL_ROOT'] ? ENV['RAILS_RELATIVE_URL_ROOT'] : '/'
++  :session_path => ENV['RAILS_RELATIVE_URL_ROOT'].empty? ? '/' : ENV['RAILS_RELATIVE_URL_ROOT']
 +}
 +
  # Load Engine plugin if available