aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-27 14:16:15 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-27 18:17:26 -0300
commit4f66586bbfacbce4c07f2b9d8d142be1bf6d4e5e (patch)
tree6c0a791e8b226d1b1e00e31d0eb3119347a0021c /actionpack/lib/action_view/helpers/form_helper.rb
parent5f3726091851326d4976624db374a20d356b1630 (diff)
downloadrails-4f66586bbfacbce4c07f2b9d8d142be1bf6d4e5e.tar.gz
rails-4f66586bbfacbce4c07f2b9d8d142be1bf6d4e5e.tar.bz2
rails-4f66586bbfacbce4c07f2b9d8d142be1bf6d4e5e.zip
Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
Textarea newline fix breaks haml (3-2-stable)
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 2267f3c185..edca950638 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1072,7 +1072,7 @@ module ActionView
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
- content_tag("textarea", "\n#{options.delete('value') || value_before_type_cast(object)}", options)
+ content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
end
def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")