From 03d01ec73edfac7768cd3623d4037e8a6cc5a89a Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Mon, 20 Jun 2011 12:32:47 -0400 Subject: [PATCH] Streamline fragment_for SafeBuffer logic to make it more concise and robust against unsafe buffers. --- actionpack/lib/action_view/helpers/cache_helper.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb index b57617b3d1c65..f81ce3e31c11f 100644 --- a/actionpack/lib/action_view/helpers/cache_helper.rb +++ b/actionpack/lib/action_view/helpers/cache_helper.rb @@ -51,12 +51,10 @@ def fragment_for(name = {}, options = nil, &block) #:nodoc: # This dance is needed because Builder can't use capture pos = output_buffer.length yield - if output_buffer.is_a?(ActionView::OutputBuffer) - safe_output_buffer = output_buffer.to_str - fragment = safe_output_buffer.slice!(pos..-1) - self.output_buffer = ActionView::OutputBuffer.new(safe_output_buffer) - else - fragment = output_buffer.slice!(pos..-1) + output_safe = output_buffer.html_safe? + fragment = output_buffer.slice!(pos..-1) + if output_safe + self.output_buffer = output_buffer.html_safe end controller.write_fragment(name, fragment, options) end