Revert "Re-enable capture'ing non-String values"

This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.

4 files changed, 3 insertions, 15 deletions

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index dbdf682614..729717608f 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,8 +1 @@
 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 7884e4f1f1..75d1634b2e 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
+        if string = buffer.presence || value and string.is_a?(String)
           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 b2b8513d4f..f213da5934 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_value_even_if_the_returned_value_is_not_a_string
-    assert_equal '1', @av.capture { 1 }
+  def test_capture_returns_nil_if_the_returned_value_is_not_a_string
+    assert_nil @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 2b3915edcd..ce89d5728e 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -64,11 +64,6 @@ 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") },