@layout is a confusing name... use @cache_layout

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 35111a4b92..3e5240a0ef 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -112,7 +112,7 @@ module ActionController #:nodoc:
 
       class ActionCacheFilter #:nodoc:
         def initialize(options, &block)
-          @cache_path, @store_options, @layout =
+          @cache_path, @store_options, @cache_layout =
             options.values_at(:cache_path, :store_options, :layout)
         end
 
@@ -126,10 +126,10 @@ module ActionController #:nodoc:
           cache_path = ActionCachePath.new(controller, path_options || {})
 
           if cache = controller.read_fragment(cache_path.path, @store_options)
-            controller._render_cache_fragment(cache, cache_path.extension, @layout == false)
+            controller._render_cache_fragment(cache, cache_path.extension, @cache_layout == false)
           else
             yield
-            controller._save_fragment(cache_path.path, @layout == false, @store_options)
+            controller._save_fragment(cache_path.path, @cache_layout == false, @store_options)
           end
         end
       end