aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-07-17 13:34:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-07-17 13:36:33 -0700
commitcb3f25593b1137e344086364d4b1a52c08e8eb3b (patch)
treea52e223b6119ab2c2ed51f3ac601b0ac616c5ce3 /actionpack
parent2df8e86caf35d6f85d6b4fe260ddd247bbe6772a (diff)
downloadrails-cb3f25593b1137e344086364d4b1a52c08e8eb3b.tar.gz
rails-cb3f25593b1137e344086364d4b1a52c08e8eb3b.tar.bz2
rails-cb3f25593b1137e344086364d4b1a52c08e8eb3b.zip
remove useless function
Now that the value is cached on the stack, `array_of_permitted_scalars_filter` is exactly the same as `array_of_permitted_scalars?`, so lets just have one
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 03639c1835..cfff3190b9 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -643,13 +643,7 @@ module ActionController
end
def array_of_permitted_scalars?(value)
- if value.is_a?(Array)
- value.all? {|element| permitted_scalar?(element)}
- end
- end
-
- def array_of_permitted_scalars_filter(value)
- if array_of_permitted_scalars?(value)
+ if value.is_a?(Array) && value.all? {|element| permitted_scalar?(element)}
yield value
end
end
@@ -665,7 +659,7 @@ module ActionController
if filter[key] == EMPTY_ARRAY
# Declaration { comment_ids: [] }.
- array_of_permitted_scalars_filter(self[key]) do |val|
+ array_of_permitted_scalars?(self[key]) do |val|
params[key] = val
end
else