Permalink
Browse files

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

…er string"

This reverts commit 115e80d.
  • Loading branch information...
1 parent adef976 commit 94df84a8a4b183037c160d513bf9fa9d1858c36f 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
@@ -218,9 +218,6 @@ def compile(view, mod) #:nodoc:
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.
@@ -172,10 +172,5 @@ def with_external_encoding(encoding)
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

2 comments on commit 94df84a

@spastorino
Member

doh, I always forget about the gitconfig file. @joseicosta you now have one more commit to Rails :P

@joseicosta

Sweet! :P

Please sign in to comment.