diff options
author | Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | 2011-06-10 23:08:00 -0300 |
---|---|---|
committer | Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | 2011-06-10 23:08:00 -0300 |
commit | 94df84a8a4b183037c160d513bf9fa9d1858c36f (patch) | |
tree | a97b256eb9d2d8e8c23c3cc94e8bb451d0a1aee3 | |
parent | adef9764ae6987d3b19b67d1e76c4bb0e3eb7fab (diff) | |
download | rails-94df84a8a4b183037c160d513bf9fa9d1858c36f.tar.gz rails-94df84a8a4b183037c160d513bf9fa9d1858c36f.tar.bz2 rails-94df84a8a4b183037c160d513bf9fa9d1858c36f.zip |
Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1.
-rw-r--r-- | actionpack/lib/action_view/template.rb | 3 | ||||
-rw-r--r-- | actionpack/test/template/template_test.rb | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 9c59d18310..10797c010f 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -218,9 +218,6 @@ module ActionView method_name = self.method_name if source.encoding_aware? - # Avoid performing in-place mutation for SafeBuffer - @source = source.to_str if source.html_safe? - # Look for # encoding: *. If we find one, we'll encode the # String in that encoding, otherwise, we'll use the # default external encoding. diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb index 2beb168a9d..b0ca7de0b6 100644 --- a/actionpack/test/template/template_test.rb +++ b/actionpack/test/template/template_test.rb @@ -172,10 +172,5 @@ class TestERBTemplate < ActiveSupport::TestCase ensure silence_warnings { Encoding.default_external = old } end - - def test_render_inline_safebuffer_should_not_raise_error - @template = new_template("Hello".html_safe) - render - end end end |