with_output_buffer cannot assume there's an output_buffer

[#4182 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
rails · Mar 15, 2010 · a594a22 · a594a22
1 parent c937da9
commit a594a22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -140,7 +140,7 @@ def content_for?(name)
       def with_output_buffer(buf = nil) #:nodoc:
         unless buf
           buf = ActionView::OutputBuffer.new
-          buf.force_encoding(output_buffer.encoding) if buf.respond_to?(:force_encoding)
+          buf.force_encoding(output_buffer.encoding) if output_buffer && buf.respond_to?(:force_encoding)
         end
         self.output_buffer, old_buffer = buf, output_buffer
         yield

diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
@@ -12,4 +12,10 @@ def test_content_for
     assert content_for?(:title)
     assert ! content_for?(:something_else)
   end
+
+  def test_with_output_buffer_does_not_assume_there_is_an_output_buffer
+    av = ActionView::Base.new
+    assert_nil av.output_buffer
+    assert_equal "", av.with_output_buffer {}
+  end
 end