diff options
| author | Prem Sichanugrist <s@sikac.hu> | 2014-02-14 09:57:47 -0500 |
|---|---|---|
| committer | Prem Sichanugrist <s@sikac.hu> | 2014-02-18 12:08:36 -0500 |
| commit | 920f3ba2668e0622335f16f2f1318d9e6b5e6b28 (patch) | |
| tree | d7daebde559c09c6d319510d1ed375f9fb96f74c /actionview/lib/action_view/renderer | |
| parent | 8cd9f6d205e5db5331dd5b01be35b537da17cdee (diff) | |
| download | rails-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/renderer')
| -rw-r--r-- | actionview/lib/action_view/renderer/template_renderer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index ba946b230a..be17097428 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -27,6 +27,8 @@ module ActionView Template::Text.new(options[:text], formats.first) elsif options.key?(:plain) Template::Text.new(options[:plain]) + elsif options.key?(:html) + Template::HTML.new(options[:html], formats.first) elsif options.key?(:file) with_fallbacks { find_template(options[:file], nil, false, keys, @details) } elsif options.key?(:inline) |