Merge pull request #33695 from peterzhu2118/master

Update ParameterFilter to yield original parameters

1 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb
index de11939fa8..09aab631ed 100644
--- a/actionpack/lib/action_dispatch/http/parameter_filter.rb
+++ b/actionpack/lib/action_dispatch/http/parameter_filter.rb
@@ -56,23 +56,23 @@ module ActionDispatch
           @blocks = blocks
         end
 
-        def call(original_params, parents = [])
-          filtered_params = original_params.class.new
+        def call(params, parents = [], original_params = params)
+          filtered_params = params.class.new
 
-          original_params.each do |key, value|
+          params.each do |key, value|
             parents.push(key) if deep_regexps
             if regexps.any? { |r| key =~ r }
               value = FILTERED
             elsif deep_regexps && (joined = parents.join(".")) && deep_regexps.any? { |r| joined =~ r }
               value = FILTERED
             elsif value.is_a?(Hash)
-              value = call(value, parents)
+              value = call(value, parents, original_params)
             elsif value.is_a?(Array)
-              value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
+              value = value.map { |v| v.is_a?(Hash) ? call(v, parents, original_params) : v }
             elsif blocks.any?
               key = key.dup if key.duplicable?
               value = value.dup if value.duplicable?
-              blocks.each { |b| b.call(key, value) }
+              blocks.each { |b| b.arity == 2 ? b.call(key, value) : b.call(key, value, original_params) }
             end
             parents.pop if deep_regexps