diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-04 14:00:42 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-04 14:00:42 -0700 |
| commit | db6a399c8a7ddd3457fcb1aac388fd4d5fb7e748 (patch) | |
| tree | afc59bfbba772270a112265909118fb48578b6ef | |
| parent | a8a9091d4a47232f026e3c086858ba674c9f430e (diff) | |
| parent | 81f92cbc2b4c1f99c08d04a8a360efe64a12faf8 (diff) | |
| download | rails-db6a399c8a7ddd3457fcb1aac388fd4d5fb7e748.tar.gz rails-db6a399c8a7ddd3457fcb1aac388fd4d5fb7e748.tar.bz2 rails-db6a399c8a7ddd3457fcb1aac388fd4d5fb7e748.zip | |
Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactor
Use Hash#fetch instead of has_key? check
| -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 fc8a8c9dcd..1f52c164de 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -166,7 +166,7 @@ module ActionController unless options[:include] || options[:exclude] model ||= _default_wrap_model - role = options.has_key?(:as) ? options[:as] : :default + role = options.fetch(:as, :default) if model.respond_to?(:accessible_attributes) && model.accessible_attributes(role).present? options[:include] = model.accessible_attributes(role).to_a elsif model.respond_to?(:attribute_names) && model.attribute_names.present? |