diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-06-06 02:20:45 -0300 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-07 15:31:11 -0400 |
| commit | 399b493cb454e6f6dd1a310ba31adaa8e6550830 (patch) | |
| tree | 7ae944af629a069dae46e33c1b95abe6933dca0a /actionpack/lib | |
| parent | eebac026060ef9a5e69e69b01df61acee7c6c07f (diff) | |
| download | rails-399b493cb454e6f6dd1a310ba31adaa8e6550830.tar.gz rails-399b493cb454e6f6dd1a310ba31adaa8e6550830.tar.bz2 rails-399b493cb454e6f6dd1a310ba31adaa8e6550830.zip | |
content_tag_string shouldn't escape_html if escape param is false
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index c09d01eeee..66277f79fe 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -110,7 +110,7 @@ module ActionView def content_tag_string(name, content, options, escape = true) tag_options = tag_options(options, escape) if options - "<#{name}#{tag_options}>#{ERB::Util.h(content)}</#{name}>".html_safe + "<#{name}#{tag_options}>#{escape ? ERB::Util.h(content) : content}</#{name}>".html_safe end def tag_options(options, escape = true) |