diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-19 19:53:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 19:53:40 -0400 |
| commit | 09cb26bc1e653999827cf3eb955d42a2c932b3f5 (patch) | |
| tree | 54338924d202d273cf334e4c2cfccd38f8ba878d /actionpack/lib | |
| parent | a9bb9d7abc59d497d443d463544d5d859d08463b (diff) | |
| parent | 095036467e4e06e56452da94077500d428dd0eed (diff) | |
| download | rails-09cb26bc1e653999827cf3eb955d42a2c932b3f5.tar.gz rails-09cb26bc1e653999827cf3eb955d42a2c932b3f5.tar.bz2 rails-09cb26bc1e653999827cf3eb955d42a2c932b3f5.zip | |
Merge pull request #27990 from leonelgalan/bug/filtered_parameters_class
Use of ParameterFilter no longer forces `request.filtered_parameters' class to be Hash
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/filter_parameters.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/parameter_filter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb index e584b84d92..077ab2561f 100644 --- a/actionpack/lib/action_dispatch/http/filter_parameters.rb +++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb @@ -74,7 +74,7 @@ module ActionDispatch PAIR_RE = %r{(#{KV_RE})=(#{KV_RE})} def filtered_query_string # :doc: query_string.gsub(PAIR_RE) do |_| - parameter_filter.filter([[$1, $2]]).first.join("=") + parameter_filter.filter($1 => $2).first.join("=") end end end diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb index 889f55a52a..1d2b4b902b 100644 --- a/actionpack/lib/action_dispatch/http/parameter_filter.rb +++ b/actionpack/lib/action_dispatch/http/parameter_filter.rb @@ -54,7 +54,7 @@ module ActionDispatch end def call(original_params, parents = []) - filtered_params = {} + filtered_params = original_params.class.new original_params.each do |key, value| parents.push(key) if deep_regexps |