aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching/fragments.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-16 11:43:04 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-16 11:43:04 -0700
commitc61ed70b00c93bdf42c7538a334f07e58c60bc4e (patch)
treeaaa304345983bafd88b1860b5bf63da1271e690e /actionpack/lib/action_controller/caching/fragments.rb
parent67d8b9743add53f908ca417c641c4a54dd326c7d (diff)
downloadrails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.tar.gz
rails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.tar.bz2
rails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.zip
Some more tweaks on <% %>.
* The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works
Diffstat (limited to 'actionpack/lib/action_controller/caching/fragments.rb')
-rw-r--r--actionpack/lib/action_controller/caching/fragments.rb3
1 files changed, 1 insertions, 2 deletions
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