aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-07 11:42:40 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-07 11:42:40 +0000
commitc81f0309ebb361ae04613a2af1317624ab878dc8 (patch)
tree8c687af12599f3fd15c7146b1f62f655cf47a742 /actionpack
parent09a15f528d97812810bd3cbc73922a2f709e4626 (diff)
downloadrails-c81f0309ebb361ae04613a2af1317624ab878dc8.tar.gz
rails-c81f0309ebb361ae04613a2af1317624ab878dc8.tar.bz2
rails-c81f0309ebb361ae04613a2af1317624ab878dc8.zip
Fixed that the :multipart option in FormTagHelper#form_tag would be ignored [Yonatan Feldman]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@877 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG5
-rw-r--r--actionpack/lib/action_view/helpers/form_tag_helper.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 4c98817c8c..dcf8e93351 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed that the :multipart option in FormTagHelper#form_tag would be ignored [Yonatan Feldman]
+
+
*1.5.1* (7th March, 2005)
* Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 60e3bbb67b..2fc055686b 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -14,9 +14,9 @@ module ActionView
def form_tag(url_for_options = {}, options = {}, *parameters_for_url)
html_options = { "method" => "post" }.merge(options.stringify_keys)
- if html_options[:multipart]
+ if html_options["multipart"]
html_options["enctype"] = "multipart/form-data"
- html_options.delete(:multipart)
+ html_options.delete("multipart")
end
html_options["action"] = url_for(url_for_options, *parameters_for_url)