aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikac.hu>2014-08-18 23:42:42 -0400
committerPrem Sichanugrist <s@sikac.hu>2014-08-18 23:42:42 -0400
commit3fcbbc8a1c7aec94aa325fd583ead92a7cd291b6 (patch)
tree3adf4d1289395a02ad794a71479219cb53cd2a5a
parent3591dd59e0d5b3e99c1f54619dd78aa7dbba374e (diff)
downloadrails-3fcbbc8a1c7aec94aa325fd583ead92a7cd291b6.tar.gz
rails-3fcbbc8a1c7aec94aa325fd583ead92a7cd291b6.tar.bz2
rails-3fcbbc8a1c7aec94aa325fd583ead92a7cd291b6.zip
User `#to_hash` instead of calling `super`
Ruby 1.9.3 does not implement Hash#to_h, so we can't call `super` on it.
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 7bfe370da4..7038f0997f 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -154,7 +154,7 @@ module ActionController
# safe_params.to_h # => {"name"=>"Senjougahara Hitagi"}
def to_h
if permitted?
- super
+ to_hash
else
slice(*self.class.always_permitted_parameters).permit!.to_h
end