diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2019-01-17 14:37:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-17 14:37:22 -0500 |
commit | 9d046eb553f79cf6a6664edd2be72e6131f927a9 (patch) | |
tree | 86d64be54fc8e03acd4ad76d5f21e4a3cd210255 /actionpack/lib/action_controller/metal/flash.rb | |
parent | 3d7391cb76758c82c8ea7759b6dd8d4402bc2346 (diff) | |
parent | 9dde7d8de047b55ec636c4c7cba89ec95324d492 (diff) | |
download | rails-9d046eb553f79cf6a6664edd2be72e6131f927a9.tar.gz rails-9d046eb553f79cf6a6664edd2be72e6131f927a9.tar.bz2 rails-9d046eb553f79cf6a6664edd2be72e6131f927a9.zip |
Merge pull request #34412 from gmcgibbon/redirect_to_allow_other_host
Ensure external redirects are explicitly allowed
Diffstat (limited to 'actionpack/lib/action_controller/metal/flash.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/flash.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb index 380f2e9591..a4861dc2c0 100644 --- a/actionpack/lib/action_controller/metal/flash.rb +++ b/actionpack/lib/action_controller/metal/flash.rb @@ -44,18 +44,18 @@ module ActionController #:nodoc: end private - def redirect_to(options = {}, response_status_and_flash = {}) #:doc: + def redirect_to(options = {}, response_options_and_flash = {}) #:doc: self.class._flash_types.each do |flash_type| - if type = response_status_and_flash.delete(flash_type) + if type = response_options_and_flash.delete(flash_type) flash[flash_type] = type end end - if other_flashes = response_status_and_flash.delete(:flash) + if other_flashes = response_options_and_flash.delete(:flash) flash.update(other_flashes) end - super(options, response_status_and_flash) + super(options, response_options_and_flash) end end end |