From c61ed70b00c93bdf42c7538a334f07e58c60bc4e Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 16 Mar 2010 11:43:04 -0700
Subject: Some more tweaks on <% %>.

  * The cache helper is now semantically "mark this region for caching"
  * As a result, <% x = cache do %> no longer works
---
 actionpack/lib/action_controller/caching/fragments.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/caching')

diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 19bf3ddd3b..8a10bdfe23 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -44,9 +44,8 @@ module ActionController #:nodoc:
             buffer = view_context.output_buffer
             pos = buffer.length
             yield
-            fragment = buffer[pos..-1]
+            fragment = buffer.slice!(pos..-1)
             write_fragment(name, fragment, options)
-            fragment.is_a?(String) ? ActionView::NonConcattingString.new(fragment) : fragment
           end
         else
           ret = yield
-- 
cgit v1.2.3