Capture block so content won't leak.

The [following pull request](https://github.com/rails/rails/pull/8916) fixed
the block being passed to the appropriate helper method. However, the content
being passed into the block is generating repeated markup on the page due to
some weird ERb evaluation.

This commit tries to capture the block's generated output so the page isn't
flooded with markup.

[Rafael França + José Mota]

Closes #8936

2 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
index d27df45b5a..9655008fe2 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -13,13 +13,13 @@ module ActionView
           end
         end
 
-        def render
+        def render(&block)
           rendered_collection = render_collection do |item, value, text, default_html_options|
             default_html_options[:multiple] = true
             builder = instantiate_builder(CheckBoxBuilder, item, value, text, default_html_options)
 
             if block_given?
-              yield builder
+              @template_object.capture(builder, &block)
             else
               render_component(builder)
             end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
index 81f2ecb2b3..893f4411e7 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -13,12 +13,12 @@ module ActionView
           end
         end
 
-        def render
+        def render(&block)
           render_collection do |item, value, text, default_html_options|
             builder = instantiate_builder(RadioButtonBuilder, item, value, text, default_html_options)
 
             if block_given?
-              yield builder
+              @template_object.capture(builder, &block)
             else
               render_component(builder)
             end