aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorFrancis Irving <francis@mysociety.org>2010-09-03 14:35:39 +0100
committerFrancis Irving <francis@mysociety.org>2010-09-03 14:35:39 +0100
commit08430db20111c7e853cad6c1710ebc3dc4150375 (patch)
treef32817cf3f27c4ddc2c6325c276f069674c7e0c3 /app/controllers/application_controller.rb
parent98addf135eccf6726adc7eeae818fd62e8acf3d7 (diff)
Revert "Don't set cookies in feed filters"
This reverts commit 98addf135eccf6726adc7eeae818fd62e8acf3d7.
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e2f303c05..959caf7ef 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -37,7 +37,6 @@ 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.
@@ -190,7 +189,6 @@ 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]