[DRE-commits] r4372 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-11-23 00:20:59 +0000 (Mon, 23 Nov 2009)
New Revision: 4372

Modified:
   trunk/redmine/debian/patches/rails22.patch
Log:
Update patch (missed a rails 2.3 patch)

Modified: trunk/redmine/debian/patches/rails22.patch
===================================================================
--- trunk/redmine/debian/patches/rails22.patch	2009-11-23 00:20:54 UTC (rev 4371)
+++ trunk/redmine/debian/patches/rails22.patch	2009-11-23 00:20:59 UTC (rev 4372)
@@ -1,9 +1,9 @@
 diff --git a/app/controllers/application.rb b/app/controllers/application.rb
 new file mode 100644
-index 0000000..68377b6
+index 0000000..ec23775
 --- /dev/null
 +++ b/app/controllers/application.rb
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,257 @@
 +# redMine - project management software
 +# Copyright (C) 2006-2007  Jean-Philippe Lang
 +#
@@ -27,6 +27,11 @@
 +class ApplicationController < ActionController::Base
 +  include Redmine::I18n
 +
++  # In case the cookie store secret changes
++  rescue_from CGI::Session::CookieStore::TamperedWithCookie do |exception|
++    render :text => 'Your session was invalid and has been reset. Please, reload this page.', :status => 500
++  end
++
 +  layout 'base'
 +  
 +  before_filter :user_setup, :check_if_login_required, :set_localization