github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't write nil values to default session options hash

Browse Source
This commit is contained in:
Joshua Peek
2008-12-16 00:04:04 -06:00
parent 95c839bd2a
commit 9a733f6c64
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_controller/session_management.rb
View File

@@ -17,9 +17,15 @@ module ActionController #:nodoc:
cgi_options = ActionController::Base.session_options
options = cgi_options.symbolize_keys
options = DEFAULT_OPTIONS.merge(options)
options[:path] = options.delete(:session_path)
options[:key] = options.delete(:session_key)
options[:httponly] = options.delete(:session_http_only)
if options.has_key?(:session_path)
options[:path] = options.delete(:session_path)
end
if options.has_key?(:session_key)
options[:key] = options.delete(:session_key)
end
if options.has_key?(:session_http_only)
options[:httponly] = options.delete(:session_http_only)
end
if store = ActionController::Base.session_store
store.new(app, options)