diff options
| author | Drew Ulmer <latortuga@gmail.com> | 2012-11-27 09:27:41 -0600 |
|---|---|---|
| committer | Drew Ulmer <latortuga@gmail.com> | 2012-11-27 12:16:25 -0600 |
| commit | e105adc2406198b9af27f40b7e5bedd9de5d3a9b (patch) | |
| tree | 6612b26e42ee9dd3e9d2dc52d3e05ae36af283ae /actionpack/lib/action_view | |
| parent | e969ba955da04bf24a68475c1d24e138ae875ad0 (diff) | |
| download | rails-e105adc2406198b9af27f40b7e5bedd9de5d3a9b.tar.gz rails-e105adc2406198b9af27f40b7e5bedd9de5d3a9b.tar.bz2 rails-e105adc2406198b9af27f40b7e5bedd9de5d3a9b.zip | |
Cleanup CacheHelper changes allowing opt-out of cache digests
Instead of deleting the skip_digest option flag, this changes the method to merely check the
key. This change is because of a discussion in this thread:
https://github.com/rails/rails/pull/8317
This commit also makes #fragment_name_with_digest private due to its
functionality being subsumed by #cache_fragment_name.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/cache_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb index fbaba63997..db920ae7a4 100644 --- a/actionpack/lib/action_view/helpers/cache_helper.rb +++ b/actionpack/lib/action_view/helpers/cache_helper.rb @@ -126,7 +126,7 @@ module ActionView # cannot be manually expired unless you know the exact key which is the # case when using memcached. def cache_fragment_name(name = {}, options = nil) - skip_digest = options && options.delete(:skip_digest) + skip_digest = options && options[:skip_digest] if skip_digest name @@ -135,6 +135,7 @@ module ActionView end end + private def fragment_name_with_digest(name) #:nodoc: if @virtual_path [ @@ -146,7 +147,6 @@ module ActionView end end - private # TODO: Create an object that has caching read/write on it def fragment_for(name = {}, options = nil, &block) #:nodoc: if fragment = controller.read_fragment(name, options) |