From 93eaaef43c5614a61bde3eace9a539b5703f3168 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Tue, 28 Aug 2007 23:16:49 +0000 Subject: 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 --- actionpack/lib/action_controller/session_management.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') 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] -- cgit v1.2.3