From 1ac7cd56fe4b49f0d30c96b2ec68abde8b05ee18 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 18 May 2007 00:36:14 +0000 Subject: Clean up the simply_helpful merge. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6751 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/form_helper.rb | 3 ++- actionpack/lib/action_view/helpers/prototype_helper.rb | 1 + actionpack/lib/action_view/helpers/url_helper.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_view/helpers') 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 diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 9bf9a71df2..1586a99e4c 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -191,6 +191,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_remote_tag(options), proc.binding) diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 2329fb4bc6..d22a1464a0 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -75,7 +75,7 @@ module ActionView url = @controller.send(:url_for, nil) else escape = false - url = polymorphic_path(options, self) + url = polymorphic_path(options) end escape ? html_escape(url) : url -- cgit v1.2.3