aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-18 00:36:14 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-18 00:36:14 +0000
commit1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18 (patch)
tree9efe8a7754037e0782c8872f04f3703c6aa10f4f /actionpack/lib/action_view/helpers/form_helper.rb
parentebee0a742d40f87bb9b78d5d88393c341761cfad (diff)
downloadrails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.tar.gz
rails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.tar.bz2
rails-1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18.zip
Clean up the simply_helpful merge.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6751 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.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index d307c194d2..c985a22edb 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -167,6 +167,7 @@ module ActionView
object = record_or_name
object_name = ActionController::RecordIdentifier.singular_class_name(record_or_name)
apply_form_for_options!(object, options)
+ args.unshift object
end
concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}), proc.binding)
@@ -184,7 +185,7 @@ module ActionView
options[:html] ||= {}
options[:html].reverse_merge!(html_options)
- options[:url] ||= polymorphic_path(object, self)
+ options[:url] ||= polymorphic_path(object)
end
# Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes