aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorFrancis Irving <francis@mysociety.org>2010-09-03 13:50:38 +0100
committerFrancis Irving <francis@mysociety.org>2010-09-03 13:50:38 +0100
commit98addf135eccf6726adc7eeae818fd62e8acf3d7 (patch)
treee4eb59a9ac8c6e5e0847c215956eed7d867fe2be /app/controllers/application_controller.rb
parenta4cf6646eb49ed229e762157b511f3369d012f80 (diff)
Don't set cookies in feed filters
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 959caf7ef..e2f303c05 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -37,6 +37,7 @@ class ApplicationController < ActionController::Base
# Set cookie expiry according to "remember me" checkbox, as per "An easier
# and more flexible hack" on this page:
# http://wiki.rubyonrails.org/rails/pages/HowtoChangeSessionOptions
+ # Note: This is skipped in TrackController
before_filter :session_remember_me
def session_remember_me
# Reset the "sliding window" session expiry time.
@@ -189,6 +190,7 @@ class ApplicationController < ActionController::Base
end
# Default layout shows user in corner, so needs access to it
+ # Note: This is skipped in TrackController
before_filter :authentication_check
def authentication_check
if session[:user_id]