diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 14:12:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 14:12:49 -0300 |
| commit | d215620340be7cb29e2aa87aab22da5ec9e6e6a7 (patch) | |
| tree | ae8a01086d98a67677b7af438823a393c3f3fb66 /actionpack/lib/action_controller/metal/force_ssl.rb | |
| parent | bbbbfe1ac02162ecb5e9a7b560134a3221f129f3 (diff) | |
| parent | 242c5c7ae4b9dbc1558ee9d673335f2b1e209188 (diff) | |
| download | rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.gz rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.bz2 rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.zip | |
Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error
Fix fails to force_ssl_redirection if session_store is disabled
Diffstat (limited to 'actionpack/lib/action_controller/metal/force_ssl.rb')
| -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 d920668184..5a8c7db162 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 respond_to?(:flash) + flash.keep if request.respond_to?(:flash) redirect_to secure_url, options.slice(*REDIRECT_OPTIONS) end end |