aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-08-16 19:14:06 +0100
committerJon Leighton <j@jonathanleighton.com>2011-08-16 19:14:20 +0100
commit8e236152457ed48bb436e9bffb4c5d6d4b6a26d4 (patch)
tree8399705099848741f225d1c71916438717bc82b0 /actionpack/lib
parentd0d25a9317aaea794f30e067e9388fe4e08bcde5 (diff)
downloadrails-8e236152457ed48bb436e9bffb4c5d6d4b6a26d4.tar.gz
rails-8e236152457ed48bb436e9bffb4c5d6d4b6a26d4.tar.bz2
rails-8e236152457ed48bb436e9bffb4c5d6d4b6a26d4.zip
Use lazy load hooks to set parameter wrapping configuration. This means that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index dfc4e3d72c..2d8afc3a78 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -121,8 +121,6 @@ module ActionController
_set_wrapper_defaults(_wrapper_options.slice(:format).merge(options), model)
end
- alias :wrap_parameters= :wrap_parameters
-
# Sets the default wrapper key or model which will be used to determine
# wrapper key and attribute names. Will be called automatically when the
# module is inherited.