aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-01-16 14:05:59 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-01-16 14:05:59 +0100
commit730300a2602e4e6874de56194b79e3e5e474960e (patch)
treecb22e842ed9805e2f45de816753ef2850fcf7350 /actionpack/lib/action_controller/metal
parent0f39f18b43082d7a40bf042d5db95b2f0c8d39eb (diff)
downloadrails-730300a2602e4e6874de56194b79e3e5e474960e.tar.gz
rails-730300a2602e4e6874de56194b79e3e5e474960e.tar.bz2
rails-730300a2602e4e6874de56194b79e3e5e474960e.zip
Revert "significant speedup of AC::Parameters#permit" [26dd9b26ab7317f94fd285245879e888344143b2] as it broke Parameters#to_h on at least fields_for-style nested params.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 6e8df02fb9..d304dcf468 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -398,8 +398,7 @@ module ActionController
unpermitted_parameters!(params) if self.class.action_on_unpermitted_parameters
- params.permitted = true
- params
+ params.permit!
end
# Returns a parameter for the given +key+. If not found,
@@ -818,7 +817,6 @@ module ActionController
# Filter this one out.
end
end
- sanitized.permitted = true
end
end