diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-03 05:41:03 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-03 05:41:03 -0700 |
| commit | fb7abea99aeccb07962e4e82abbd110ab51eae47 (patch) | |
| tree | a6516dfc8dc9cf29f0ec986a5e2f8db1ef205660 /actionpack/lib | |
| parent | 54174b5f4d24115bf1d005f7073041654da27f5f (diff) | |
| parent | e821611cb6142d2055de565fabe783ffd6ef4cfb (diff) | |
| download | rails-fb7abea99aeccb07962e4e82abbd110ab51eae47.tar.gz rails-fb7abea99aeccb07962e4e82abbd110ab51eae47.tar.bz2 rails-fb7abea99aeccb07962e4e82abbd110ab51eae47.zip | |
Merge pull request #6139 from pwim/extract_options-actionpack
use extract_options!
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/redirection.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb index 444a79c50d..95c588c00a 100644 --- a/actionpack/lib/action_dispatch/routing/redirection.rb +++ b/actionpack/lib/action_dispatch/routing/redirection.rb @@ -1,5 +1,6 @@ require 'action_dispatch/http/request' require 'active_support/core_ext/uri' +require 'active_support/core_ext/array/extract_options' require 'rack/utils' module ActionDispatch @@ -99,7 +100,7 @@ module ActionDispatch # match 'accounts/:name' => redirect(SubdomainRedirector.new('api')) # def redirect(*args, &block) - options = args.last.is_a?(Hash) ? args.pop : {} + options = args.extract_options! status = options.delete(:status) || 301 return OptionRedirect.new(status, options) if options.any? |