From c2fe0938d7201d4ce0bb2f25e72bf5f70df128af Mon Sep 17 00:00:00 2001
From: Carsten Zimmermann <cz@aegisnet.de>
Date: Sat, 13 Dec 2014 22:20:31 +0100
Subject: [PATCH] Re-enable capture'ing non-String values

This has been discussed in #17661 and partially reverts the changes made
in 9de83050d3a4b260d4aeb5d09ec4eb64f913ba64 and 986cac73e3c56b3dfa22fd1464f6913e38d32cc3

The test case added to content_for acts as a regression / acceptance test.
---
 actionview/CHANGELOG.md                              | 7 +++++++
 actionview/lib/action_view/helpers/capture_helper.rb | 2 +-
 actionview/test/template/capture_helper_test.rb      | 4 ++--
 actionview/test/template/tag_helper_test.rb          | 5 +++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 729717608f..dbdf682614 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1 +1,8 @@
 Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/actionview/CHANGELOG.md) for previous changes.
+
+*   Restore old behaviour for `capture` to return value as is when passed non-String values.
+
+    Fixes #17661.
+
+    *Carsten Zimmermann*
+
diff --git a/actionview/lib/action_view/helpers/capture_helper.rb b/actionview/lib/action_view/helpers/capture_helper.rb
index 75d1634b2e..7884e4f1f1 100644
--- a/actionview/lib/action_view/helpers/capture_helper.rb
+++ b/actionview/lib/action_view/helpers/capture_helper.rb
@@ -36,7 +36,7 @@ module ActionView
       def capture(*args)
         value = nil
         buffer = with_output_buffer { value = yield(*args) }
-        if string = buffer.presence || value and string.is_a?(String)
+        if string = buffer.presence || value
           ERB::Util.html_escape string
         end
       end
diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb
index f213da5934..b2b8513d4f 100644
--- a/actionview/test/template/capture_helper_test.rb
+++ b/actionview/test/template/capture_helper_test.rb
@@ -24,8 +24,8 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', string
   end
 
-  def test_capture_returns_nil_if_the_returned_value_is_not_a_string
-    assert_nil @av.capture { 1 }
+  def test_capture_returns_value_even_if_the_returned_value_is_not_a_string
+    assert_equal '1', @av.capture { 1 }
   end
 
   def test_capture_escapes_html
diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb
index ce89d5728e..2b3915edcd 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -64,6 +64,11 @@ class TagHelperTest < ActionView::TestCase
                  content_tag("a", "href" => "create") { "Create" }
   end
 
+  def test_content_tag_with_block_and_non_string_outside_out_of_erb
+    assert_equal content_tag("p", "1.0", nil, false),
+                 content_tag("p") { 1.0 }
+  end
+
   def test_content_tag_nested_in_content_tag_out_of_erb
     assert_equal content_tag("p", content_tag("b", "Hello")),
                  content_tag("p") { content_tag("b", "Hello") },