Merge pull request #1639 from sikachu/3-0-stable-render-inline

Render inline fix for 3-0-stable

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *Rails 3.0.9 (unreleased)*
 
+* json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove]
+
 * Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
 
 * Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]

actionpack/lib/action_view/template.rb

@@ -192,6 +192,9 @@ 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.

actionpack/test/template/template_test.rb

@@ -128,5 +128,10 @@ 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