aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers
diff options
context:
space:
mode:
authorpseidemann <paul.seidemann@gmail.com>2013-11-08 17:13:59 +0100
committerpseidemann <paul.seidemann@gmail.com>2013-11-08 17:13:59 +0100
commit881a2cc9071a3447d562ba358ccd1cf370124617 (patch)
tree97293b4c62cec987fc52a5cd22e03e19f4f1ee3d /actionview/lib/action_view/helpers
parent37d4bfbfd9c49cdddcafdc135165b2d6932b074a (diff)
downloadrails-881a2cc9071a3447d562ba358ccd1cf370124617.tar.gz
rails-881a2cc9071a3447d562ba358ccd1cf370124617.tar.bz2
rails-881a2cc9071a3447d562ba358ccd1cf370124617.zip
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.rb2
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