diff options
| author | Paul McMahon <paul@mobalean.com> | 2012-05-03 18:02:25 +0900 |
|---|---|---|
| committer | Paul McMahon <paul@mobalean.com> | 2012-05-03 21:21:02 +0900 |
| commit | e821611cb6142d2055de565fabe783ffd6ef4cfb (patch) | |
| tree | a960fe044b625fed8b30a6d783a85007fe065e4e | |
| parent | 5c0cbb3d2f0aa3bf73bb628ea720fa08beb701b6 (diff) | |
| download | rails-e821611cb6142d2055de565fabe783ffd6ef4cfb.tar.gz rails-e821611cb6142d2055de565fabe783ffd6ef4cfb.tar.bz2 rails-e821611cb6142d2055de565fabe783ffd6ef4cfb.zip | |
use extract_options!
| -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? |