Skip to content

Commit

Permalink
Merge pull request rails#2489 from grzuy/master
Browse files Browse the repository at this point in the history
Remove parameters_for_url from form_tag method header
  • Loading branch information
spastorino committed Aug 11, 2011
2 parents d00e164 + 9e81bfd commit e6fdfd0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions actionpack/lib/action_view/helpers/form_tag_helper.rb
Expand Up @@ -56,8 +56,8 @@ module FormTagHelper
# form_tag('http://far.away.com/form', :authenticity_token => "cf50faa3fe97702ca1ae")
# # form with custom authenticity token
#
def form_tag(url_for_options = {}, options = {}, *parameters_for_url, &block)
html_options = html_options_for_form(url_for_options, options, *parameters_for_url)
def form_tag(url_for_options = {}, options = {}, &block)
html_options = html_options_for_form(url_for_options, options)
if block_given?
form_tag_in_block(html_options, &block)
else
Expand Down Expand Up @@ -604,12 +604,12 @@ def utf8_enforcer_tag
end

private
def html_options_for_form(url_for_options, options, *parameters_for_url)
def html_options_for_form(url_for_options, options)
options.stringify_keys.tap do |html_options|
html_options["enctype"] = "multipart/form-data" if html_options.delete("multipart")
# The following URL is unescaped, this is just a hash of options, and it is the
# responsibility of the caller to escape all the values.
html_options["action"] = url_for(url_for_options, *parameters_for_url)
html_options["action"] = url_for(url_for_options)
html_options["accept-charset"] = "UTF-8"
html_options["data-remote"] = true if html_options.delete("remote")
html_options["authenticity_token"] = html_options.delete("authenticity_token") if html_options.has_key?("authenticity_token")
Expand Down

0 comments on commit e6fdfd0

Please sign in to comment.