Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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:

rails#8317

This commit also makes #fragment_name_with_digest private due to its
functionality being subsumed by #cache_fragment_name.
  • Loading branch information...
commit e105adc2406198b9af27f40b7e5bedd9de5d3a9b 1 parent e969ba9
@latortuga authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_view/helpers/cache_helper.rb
View
4 actionpack/lib/action_view/helpers/cache_helper.rb
@@ -126,7 +126,7 @@ def cache(name = {}, options = nil, &block)
# 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 @@ def cache_fragment_name(name = {}, options = nil)
end
end
+ private
def fragment_name_with_digest(name) #:nodoc:
if @virtual_path
[
@@ -146,7 +147,6 @@ def fragment_name_with_digest(name) #:nodoc:
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)
Please sign in to comment.
Something went wrong with that request. Please try again.