From a88636fa779935af5ec683fbe4b69b3229e116e7 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Fri, 12 Feb 2016 20:46:34 +0100 Subject: Don't search in locals for cache_options. We should only support a top level `cache_options`. We also don't have to default the options to a hash as Active Support's cache defaults that arg to nil. --- .../lib/action_view/renderer/partial_renderer/collection_caching.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'actionview/lib/action_view') diff --git a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb index 1147963882..19d9fdf1d4 100644 --- a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb +++ b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb @@ -56,12 +56,10 @@ module ActionView end def fetch_or_cache_partial(cached_partials, order_by:) - cache_options = @options[:cache_options] || @locals[:cache_options] || {} - order_by.map do |key| cached_partials.fetch(key) do yield.tap do |rendered_partial| - collection_cache.write(key, rendered_partial, cache_options) + collection_cache.write(key, rendered_partial, @options[:cache_options]) end end end -- cgit v1.2.3