Permalink
Browse files

Revert "Make sure that we don't perform in-place mutation on SafeBuff…

…er string"

This reverts commit 104e200.
  • Loading branch information...
1 parent 70b4ea9 commit 0019379e55b9ba2983a513dcee6297298547ef04 Santiago Pastorino and José Ignacio Costa committed Jun 11, 2011
Showing with 0 additions and 8 deletions.
  1. +0 −3 actionpack/lib/action_view/template.rb
  2. +0 −5 actionpack/test/template/template_test.rb
View
3 actionpack/lib/action_view/template.rb
@@ -192,9 +192,6 @@ def compile(locals, view, mod)
locals_code = locals.keys.map! { |key| "#{key} = local_assigns[:#{key}];" }.join
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.
View
5 actionpack/test/template/template_test.rb
@@ -128,10 +128,5 @@ def with_external_encoding(encoding)
ensure
Encoding.default_external = old
end
-
- def test_render_inline_safebuffer_should_not_raise_error
- @template = new_template("Hello".html_safe)
- render
- end
end
end

0 comments on commit 0019379

Please sign in to comment.