fix #1109 and do some small optimizations on home page

This commit is contained in:
Reinier Balt 2011-02-25 23:54:53 +01:00
parent 4cca813bc7
commit e9d92438d6
5 changed files with 14 additions and 10 deletions

View file

@ -59,7 +59,7 @@ class ApplicationController < ActionController::Base
def set_session_expiration
# http://wiki.rubyonrails.com/rails/show/HowtoChangeSessionOptions
unless session == nil
return if @controller_name == 'feed' or session['noexpiry'] == "on"
return if self.controller_name == 'feed' or session['noexpiry'] == "on"
# If the method is called by the feed controller (which we don't have
# under session control) or if we checked the box to keep logged in on
# login don't set the session expiry time.