diff options
Diffstat (limited to 'actionpack/lib')
| -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. |