aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-04 08:08:19 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-04 08:08:19 -0800
commite2e4216d645ce32ad11b2a681b45c85025de3d1d (patch)
tree7ad54e9c2025222100635d20aa55e220a94ca9e6 /actionpack/lib/action_view/helpers
parent40cf1269074a181a23f362a910dfaf2a02f7e562 (diff)
parent38b9fbf1d98febed449a152b2098deccea48603a (diff)
downloadrails-e2e4216d645ce32ad11b2a681b45c85025de3d1d.tar.gz
rails-e2e4216d645ce32ad11b2a681b45c85025de3d1d.tar.bz2
rails-e2e4216d645ce32ad11b2a681b45c85025de3d1d.zip
Merge pull request #4289 from rafaelfranca/patch-1
No need of html_safe here
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-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 d46ee4faef..1e4bebeee7 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1093,7 +1093,7 @@ module ActionView
end
hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
checkbox = tag("input", options)
- (hidden + checkbox).html_safe
+ hidden + checkbox
end
def to_boolean_select_tag(options = {})