diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-02-27 06:36:25 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-02-27 06:36:25 +0000 |
| commit | df7ca38d7dc2419a564c223071b92c5570cf7a58 (patch) | |
| tree | 79034a158bfe198450149c69c6bf82b1af0d6ec5 /actionpack/lib/action_controller | |
| parent | 88876163f9fa830a846e9b97a8347248837b6613 (diff) | |
| download | rails-df7ca38d7dc2419a564c223071b92c5570cf7a58.tar.gz rails-df7ca38d7dc2419a564c223071b92c5570cf7a58.tar.bz2 rails-df7ca38d7dc2419a564c223071b92c5570cf7a58.zip | |
session_enabled? works with session :off. Closes #6680.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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. |