diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
| commit | edd68a587f412ccdf15613c663acbab341d45017 (patch) | |
| tree | 386437d0bb09c7944943b0590a5f80c60146e853 /actionpack/lib/action_view/helpers/form_helper.rb | |
| parent | 34b081112536e382845e8dee146d884b4af20c4a (diff) | |
| download | rails-edd68a587f412ccdf15613c663acbab341d45017.tar.gz rails-edd68a587f412ccdf15613c663acbab341d45017.tar.bz2 rails-edd68a587f412ccdf15613c663acbab341d45017.zip | |
Refactored in use of extract_options! (closes #9079) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 22d2984adb..9c31fb6c90 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -158,7 +158,7 @@ module ActionView def form_for(record_or_name_or_array, *args, &proc) raise ArgumentError, "Missing block" unless block_given? - options = args.last.is_a?(Hash) ? args.pop : {} + options = args.extract_options! case record_or_name_or_array when String, Symbol @@ -212,7 +212,7 @@ module ActionView # like FormOptionHelper#collection_select and DateHelper#datetime_select. def fields_for(object_name, *args, &block) raise ArgumentError, "Missing block" unless block_given? - options = args.last.is_a?(Hash) ? args.pop : {} + options = args.extract_options! object = args.first builder = options[:builder] || ActionView::Base.default_form_builder |