Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 3deb60e6b492b5b944e7e6ead3531ad4e412f56d 1 parent 587f468
Carlhuda authored

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 3 actionpack/lib/action_controller/caching/actions.rb
6 actionpack/lib/action_controller/caching/actions.rb
@@ -112,7 +112,7 @@ def expire_action(options = {})
112 112
113 113 class ActionCacheFilter #:nodoc:
114 114 def initialize(options, &block)
115   - @cache_path, @store_options, @layout =
  115 + @cache_path, @store_options, @cache_layout =
116 116 options.values_at(:cache_path, :store_options, :layout)
117 117 end
118 118
@@ -126,10 +126,10 @@ def filter(controller)
126 126 cache_path = ActionCachePath.new(controller, path_options || {})
127 127
128 128 if cache = controller.read_fragment(cache_path.path, @store_options)
129   - controller._render_cache_fragment(cache, cache_path.extension, @layout == false)
  129 + controller._render_cache_fragment(cache, cache_path.extension, @cache_layout == false)
130 130 else
131 131 yield
132   - controller._save_fragment(cache_path.path, @layout == false, @store_options)
  132 + controller._save_fragment(cache_path.path, @cache_layout == false, @store_options)
133 133 end
134 134 end
135 135 end

0 comments on commit 3deb60e

Please sign in to comment.
Something went wrong with that request. Please try again.