diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-12 22:26:35 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-12 22:26:35 -0300 |
| commit | e085a7ddb879430133c68ccfea1f2be5cccdcfa3 (patch) | |
| tree | 620cbba1bf2fc9fedb5279ed29412188bb6cbe8c /actionpack/lib/action_controller/metal | |
| parent | 93d2eeaad5f7e2a362297384fb840461980f675e (diff) | |
| download | rails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.tar.gz rails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.tar.bz2 rails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.zip | |
Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error"
This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing
changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index 5a8c7db162..d920668184 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -89,7 +89,7 @@ module ActionController end secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS)) - flash.keep if request.respond_to?(:flash) + flash.keep if respond_to?(:flash) redirect_to secure_url, options.slice(*REDIRECT_OPTIONS) end end |