diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-12-09 17:54:09 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-12-11 11:09:32 +1100 |
| commit | ec168b279a5a358d7a96de85b3ac77f72ee672f8 (patch) | |
| tree | 47ec153aebf3a4bb5dd69e927b712053b1c6aa81 | |
| parent | d8e418b94e9eff9c1440eb80e0e872f42b9c23d5 (diff) | |
Move middleware insertion
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/initializers/session_store.rb | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 4248bcfda..0e02e9e03 100644 --- a/config/application.rb +++ b/config/application.rb @@ -64,5 +64,9 @@ module Alaveteli # See Rails::Configuration for more options ENV['RECAPTCHA_PUBLIC_KEY'] = ::Configuration::recaptcha_public_key ENV['RECAPTCHA_PRIVATE_KEY'] = ::Configuration::recaptcha_private_key + + # Insert a bit of middleware code to prevent uneeded cookie setting. + require "#{Rails.root}/lib/whatdotheyknow/strip_empty_sessions" + config.middleware.insert_before ActionDispatch::Session::CookieStore, WhatDoTheyKnow::StripEmptySessions, :key => '_wdtk_cookie_session', :path => "/", :httponly => true end end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index ef1752c13..ca283d4e0 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,7 +1,2 @@ # Be sure to restart your server when you modify this file. Rails.application.config.session_store :cookie_store, :key => '_wdtk_cookie_session' - -# Insert a bit of middleware code to prevent uneeded cookie setting. -require "#{Rails.root}/lib/whatdotheyknow/strip_empty_sessions" -ActionController::Dispatcher.middleware.insert_before ActionController::Base.session_store, WhatDoTheyKnow::StripEmptySessions, :key => '_wdtk_cookie_session', :path => "/", :httponly => true - |