diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-09 04:07:50 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-09 04:07:50 -0800 |
| commit | 675304b478dd36eacd3bac96c9eef96890d4aa91 (patch) | |
| tree | 7a84c2cb851305652bf166c49ba2dc9af9999468 /actionview/lib/action_view/helpers | |
| parent | 97f0d9a0dd12e7ad634815eecfeff866f64aad92 (diff) | |
| parent | 881a2cc9071a3447d562ba358ccd1cf370124617 (diff) | |
| download | rails-675304b478dd36eacd3bac96c9eef96890d4aa91.tar.gz rails-675304b478dd36eacd3bac96c9eef96890d4aa91.tar.bz2 rails-675304b478dd36eacd3bac96c9eef96890d4aa91.zip | |
Merge pull request #12760 from pseidemann/master
fix simple_format escapes own output when sanitize is set to true
Diffstat (limited to 'actionview/lib/action_view/helpers')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index c23d605c5f..b0e4aa3cd3 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -268,7 +268,7 @@ module ActionView content_tag(wrapper_tag, nil, html_options) else paragraphs.map! { |paragraph| - content_tag(wrapper_tag, paragraph, html_options, options[:sanitize]) + content_tag(wrapper_tag, paragraph, html_options, false) }.join("\n\n").html_safe end end |