1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 9cd9d3d06a..990c30b90d 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -31,10 +31,13 @@ module ActionView
       #   </body></html>
       #
       def capture(*args, &block)
-        if output_buffer
+        # Return captured buffer in erb.
+        if block_called_from_erb?(block)
           with_output_buffer { block.call(*args) }
+
+        # Return block result otherwise, but protect buffer also.
         else
-          block.call(*args)
+          with_output_buffer { return block.call(*args) }
         end
       end
 
@@ -117,6 +120,7 @@ module ActionView
         ivar = "@content_for_#{name}"
         content = capture(&block) if block_given?
         instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{content}")
+        nil
       end
 
       private