diff options
author | Casebook Developer <casebook-dev@googlegroups.com> | 2011-08-04 13:34:47 -0400 |
---|---|---|
committer | Casebook Developer <casebook-dev@googlegroups.com> | 2011-08-04 13:34:47 -0400 |
commit | f0034c75d5a9bc5065652c2fedf39250a6f1847b (patch) | |
tree | a82df412b2a8494bb760f282ad201c44f5082272 | |
parent | 3a4dc9d34c1cde8bf34dfa4b4600fb8bcef9eb45 (diff) | |
download | rails-f0034c75d5a9bc5065652c2fedf39250a6f1847b.tar.gz rails-f0034c75d5a9bc5065652c2fedf39250a6f1847b.tar.bz2 rails-f0034c75d5a9bc5065652c2fedf39250a6f1847b.zip |
ActionView::Helpers::TextHelper#simple_format should not change the text in place. Now it duplicates it.
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/text_helper_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index ae71ade588..21074efe86 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -256,7 +256,7 @@ module ActionView # # => "<p><span>I'm allowed!</span> It's true.</p>" def simple_format(text, html_options={}, options={}) text = '' if text.nil? - text = text.dup if text.frozen? + text = text.dup start_tag = tag('p', html_options, true) text = sanitize(text) unless options[:sanitize] == false text = text.to_str diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index f7c3986bb1..02f9609483 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -48,10 +48,10 @@ class TextHelperTest < ActionView::TestCase assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, :sanitize => false) end - def test_simple_format_should_not_change_the_frozen_text_passed + def test_simple_format_should_not_change_the_text_passed text = "<b>Ok</b><script>code!</script>" text_clone = text.dup - simple_format(text.freeze) + simple_format(text) assert_equal text_clone, text end |