diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-08-28 23:16:49 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-08-28 23:16:49 +0000 |
| commit | 93eaaef43c5614a61bde3eace9a539b5703f3168 (patch) | |
| tree | a09aaeb8b2c5cc41dfb0af8b3d938b900f6da927 /actionpack/lib/action_controller | |
| parent | 43ef688d7405628972d72d4aa127b9d016feacaa (diff) | |
| download | rails-93eaaef43c5614a61bde3eace9a539b5703f3168.tar.gz rails-93eaaef43c5614a61bde3eace9a539b5703f3168.tar.bz2 rails-93eaaef43c5614a61bde3eace9a539b5703f3168.zip | |
Use extract_options instead of ad-hoc partial implementations. [norbert] Closes #9313
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7364 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/session_management.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb index 5b39118001..fdf75b1b94 100644 --- a/actionpack/lib/action_controller/session_management.rb +++ b/actionpack/lib/action_controller/session_management.rb @@ -69,7 +69,7 @@ module ActionController #:nodoc: # All session options described for ActionController::Base.process_cgi # are valid arguments. def session(*args) - options = Hash === args.last ? args.pop : {} + options = args.extract_options! options[:disabled] = true if !args.empty? options[:only] = [*options[:only]].map { |o| o.to_s } if options[:only] |