diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
| commit | 089661b69ad055cab68ea860c085c7f852da3972 (patch) | |
| tree | a39fe35f3c399b199bdca8490724b451761a1cba /actionpack/lib/action_controller/metal/redirecting.rb | |
| parent | cc1de71bfaced172fe00a66fd381da69d9528e8b (diff) | |
| parent | e81453ef92b37156dafc092093106c8e8b87b268 (diff) | |
| download | rails-089661b69ad055cab68ea860c085c7f852da3972.tar.gz rails-089661b69ad055cab68ea860c085c7f852da3972.tar.bz2 rails-089661b69ad055cab68ea860c085c7f852da3972.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/redirecting.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/redirecting.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index ca8c0278d0..acaa8227c9 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -72,11 +72,11 @@ module ActionController raise AbstractController::DoubleRenderError if response_body self.status = _extract_redirect_to_status(options, response_status) - self.location = _compute_redirect_to_location(options) + self.location = _compute_redirect_to_location(request, options) self.response_body = "<html><body>You are being <a href=\"#{ERB::Util.unwrapped_html_escape(location)}\">redirected</a>.</body></html>" end - def _compute_redirect_to_location(options) #:nodoc: + def _compute_redirect_to_location(request, options) #:nodoc: case options # The scheme name consist of a letter followed by any combination of # letters, digits, and the plus ("+"), period ("."), or hyphen ("-") @@ -90,11 +90,13 @@ module ActionController when :back request.headers["Referer"] or raise RedirectBackError when Proc - _compute_redirect_to_location options.call + _compute_redirect_to_location request, options.call else url_for(options) end.delete("\0\r\n") end + module_function :_compute_redirect_to_location + public :_compute_redirect_to_location private def _extract_redirect_to_status(options, response_status) |