diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-14 21:52:31 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-14 21:52:31 -0700 |
commit | 5d24c3c8c58ffa3c617972b17fdfca53ee34e44d (patch) | |
tree | 172b83f25c7d7dd159c2fe60c7684099ef3062ad /actionpack/lib/action_controller/metal | |
parent | 7e6145b4a2108a4ad94af02c3070789c03ccbd00 (diff) | |
parent | 3bed43c6a539638d2d4b3bc3ee7ffe5cca41a320 (diff) | |
download | rails-5d24c3c8c58ffa3c617972b17fdfca53ee34e44d.tar.gz rails-5d24c3c8c58ffa3c617972b17fdfca53ee34e44d.tar.bz2 rails-5d24c3c8c58ffa3c617972b17fdfca53ee34e44d.zip |
Merge pull request #564 from sikachu/fix_wrapper
Do not try to call `column_names` on the abstract class.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-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 9b27bb8b91..b18be60201 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -163,7 +163,7 @@ module ActionController unless options[:only] || options[:except] model ||= _default_wrap_model - if model.respond_to?(:column_names) + if !(model.respond_to?(:abstract_class?) && model.abstract_class?) && model.respond_to?(:column_names) options[:only] = model.column_names end end |