diff options
| author | Carsten Zimmermann <cz@aegisnet.de> | 2014-12-13 22:20:31 +0100 |
|---|---|---|
| committer | Carsten Zimmermann <cz@aegisnet.de> | 2014-12-14 10:57:43 +0100 |
| commit | c2fe0938d7201d4ce0bb2f25e72bf5f70df128af (patch) | |
| tree | 676af19038f69e418d8bd168b4158f1b1e4efb43 /actionview/lib/action_view/helpers | |
| parent | ef99d4cd3ecc58a8c1484740b2fb5447dbda23ab (diff) | |
| download | rails-c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.tar.gz rails-c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.tar.bz2 rails-c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.zip | |
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.
Diffstat (limited to 'actionview/lib/action_view/helpers')
| -rw-r--r-- | actionview/lib/action_view/helpers/capture_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |