aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/rendering_helper.rb
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikac.hu>2014-02-14 09:57:47 -0500
committerPrem Sichanugrist <s@sikac.hu>2014-02-18 12:08:36 -0500
commit920f3ba2668e0622335f16f2f1318d9e6b5e6b28 (patch)
treed7daebde559c09c6d319510d1ed375f9fb96f74c /actionview/lib/action_view/helpers/rendering_helper.rb
parent8cd9f6d205e5db5331dd5b01be35b537da17cdee (diff)
downloadrails-920f3ba2668e0622335f16f2f1318d9e6b5e6b28.tar.gz
rails-920f3ba2668e0622335f16f2f1318d9e6b5e6b28.tar.bz2
rails-920f3ba2668e0622335f16f2f1318d9e6b5e6b28.zip
Introduce `render :html` for render HTML string
This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail.
Diffstat (limited to 'actionview/lib/action_view/helpers/rendering_helper.rb')
-rw-r--r--actionview/lib/action_view/helpers/rendering_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb
index 4eae80cd93..15b88bcda6 100644
--- a/actionview/lib/action_view/helpers/rendering_helper.rb
+++ b/actionview/lib/action_view/helpers/rendering_helper.rb
@@ -14,6 +14,9 @@ module ActionView
# * <tt>:text</tt> - Renders the text passed in out.
# * <tt>:plain</tt> - Renders the text passed in out. Setting the content
# type as <tt>text/plain</tt>.
+ # * <tt>:html</tt> - Renders the html safe string passed in out, otherwise
+ # performs html escape on the string first. Setting the content type as
+ # <tt>text/html</tt>.
# * <tt>:body</tt> - Renders the text passed in, and does not set content
# type in the response.
#