Permalink
Browse files

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

  • Loading branch information...
1 parent 587f468 commit 3deb60e6b492b5b944e7e6ead3531ad4e412f56d Carlhuda committed Mar 18, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/lib/action_controller/caching/actions.rb
View
6 actionpack/lib/action_controller/caching/actions.rb
@@ -112,7 +112,7 @@ def expire_action(options = {})
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 @@ def filter(controller)
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

0 comments on commit 3deb60e

Please sign in to comment.