diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-03-03 18:04:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-03-03 18:04:44 +0000 |
| commit | 1dc56ba4815a5d87df34ade0125512a6101d3b87 (patch) | |
| tree | cd9d441009eadf85fb518fdb8cedb8520ba467b1 /actionpack/lib/action_view/helpers | |
| parent | b2c0359b3e63f472a1ff8bf02061c97dafb98a34 (diff) | |
| download | rails-1dc56ba4815a5d87df34ade0125512a6101d3b87.tar.gz rails-1dc56ba4815a5d87df34ade0125512a6101d3b87.tar.bz2 rails-1dc56ba4815a5d87df34ade0125512a6101d3b87.zip | |
Fixed that FormTagHelper#text_area_tag should disregard :size option if it's not a string [Brendon Davidson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6300 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 |
2 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 f583414622..543f451a7f 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -302,7 +302,7 @@ module ActionView add_default_name_and_id(options) if size = options.delete("size") - options["cols"], options["rows"] = size.split("x") + options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split) end content_tag("textarea", html_escape(options.delete('value') || value_before_type_cast(object)), options) diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index 56479dfa04..fa610215a4 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -114,7 +114,7 @@ module ActionView options.stringify_keys! if size = options.delete("size") - options["cols"], options["rows"] = size.split("x") + options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split) end content_tag :textarea, content, { "name" => name, "id" => name }.update(options.stringify_keys) |