0
@@ -477,12 +477,22 @@ class Merb::AbstractController
0
   #
0
   # ==== Parameters
0
   # *args:: Arguments to pass to the block.
0
-  # &block:: The template block to call.
0
+  # &block:: The block to call.
0
   #
0
   # ==== Returns
0
-  # String:: The output of the block.
0
+  # String:: The output of a template block or the return value of a non-template block converted to a string.
0
   def capture(*args, &block)
0
-    send("capture_#{@_engine}", *args, &block)
0
+    ret = nil
0
+
0
+    captured = send("capture_#{@_engine}", *args) do |*args|
0
+      ret = yield *args
0
+    end
0
+
0
+    if captured.empty?
0
+      ret.to_s
0
+    else
0
+      captured
0
+    end
0
   end
0
 
0
   # Calls the concatenate method for the selected template engine.

0
@@ -19,6 +19,12 @@ module Merb::Test::Fixtures
0
     class CaptureWithArgs < HelperTesting
0
     end
0
     
0
+    class CaptureReturnValue < HelperTesting
0
+    end
0
+
0
+    class CaptureNonStringReturnValue < HelperTesting
0
+    end
0
+
0
     class CaptureEq < HelperTesting
0
       def helper_using_capture(&blk)
0
         "Beginning... #{capture(&blk)}... Done"

0
@@ -10,6 +10,14 @@ describe Merb::AbstractController, " with capture and concat" do
0
     dispatch_should_make_body("CaptureWithArgs", "Capture: one, two")
0
   end
0
 
0
+  it "should support capturing the return value of a non-template block" do
0
+    dispatch_should_make_body("CaptureReturnValue", "Capture")
0
+  end
0
+
0
+  it "should support capturing the return value of a non-template block" do
0
+    dispatch_should_make_body("CaptureNonStringReturnValue", "Captured ''")
0
+  end
0
+
0
   it "should support basic helpers that use capture with <%=" do
0
     dispatch_should_make_body("CaptureEq", "Pre. Beginning... Capturing... Done. Post.")
0
   end