diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-06 07:11:06 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-06 07:11:06 +0200 |
commit | 785ee65ddfc3cd361ea2a0dbde3bfb908ed62192 (patch) | |
tree | 181ef88264be89373ec821e634558d1b0d4da0c9 /actionpack/lib/action_controller | |
parent | 41a6d96c1bced4a2e4cba20b8c209c52656f59cf (diff) | |
download | rails-785ee65ddfc3cd361ea2a0dbde3bfb908ed62192.tar.gz rails-785ee65ddfc3cd361ea2a0dbde3bfb908ed62192.tar.bz2 rails-785ee65ddfc3cd361ea2a0dbde3bfb908ed62192.zip |
Ensure params wrapper settings are not inherited and calculated each time.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 21bbe17dc3..881af74147 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -125,7 +125,7 @@ module ActionController # module is inherited. def inherited(klass) if klass._wrapper_options[:format].present? - klass._set_wrapper_defaults(klass._wrapper_options) + klass._set_wrapper_defaults(klass._wrapper_options.slice(:format)) end super end |