From 69e72af62261dd8971890711b51c6eef2c68bc71 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Jun 2008 11:53:49 -0700
Subject: [PATCH] Improve readability

---
 .../lib/action_controller/caching/fragments.rb | 18 ++++++++++--------
 .../lib/action_view/template_handlers/erb.rb   |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index e4f5de44ab..57b31ec9d1 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -61,16 +61,18 @@ def fragment_cache_key(key)
       end
 
       def fragment_for(block, name = {}, options = nil) #:nodoc:
-        unless perform_caching then block.call; return end
-
-        buffer = yield
-
-        if cache = read_fragment(name, options)
-          buffer.concat(cache)
+        if perform_caching
+          buffer = yield
+
+          if cache = read_fragment(name, options)
+            buffer.concat(cache)
+          else
+            pos = buffer.length
+            block.call
+            write_fragment(name, buffer[pos..-1], options)
+          end
         else
-          pos = buffer.length
           block.call
-          write_fragment(name, buffer[pos..-1], options)
         end
       end
 
diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
index 458416b6cb..ac715e30c2 100644
--- a/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -53,7 +53,9 @@ def compile(template)
       end
 
       def cache_fragment(block, name = {}, options = nil) #:nodoc:
-        @view.fragment_for(block, name, options) { @view.response.template.output_buffer ||= '' }
+        @view.fragment_for(block, name, options) do
+          @view.response.template.output_buffer
+        end
       end
     end
   end
-- 
GitLab