From df7ca38d7dc2419a564c223071b92c5570cf7a58 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 27 Feb 2007 06:36:25 +0000 Subject: session_enabled? works with session :off. Closes #6680. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 39ffb06212..a7b702cd3e 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -585,7 +585,7 @@ module ActionController #:nodoc: end def session_enabled? - request.session_options[:disabled] != false + request.session_options && request.session_options[:disabled] != false end # View load paths for controller. -- cgit v1.2.3