aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/session_management.rb2
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]