diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-27 10:19:55 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-27 10:19:55 -0800 |
| commit | 6c0ea8875fa888f1f20b31e9ef67b73966078b14 (patch) | |
| tree | 6612b26e42ee9dd3e9d2dc52d3e05ae36af283ae /actionpack/lib | |
| parent | 5b9c9026c43517bbdcbcf0617c708a68d5e000fb (diff) | |
| parent | e105adc2406198b9af27f40b7e5bedd9de5d3a9b (diff) | |
| download | rails-6c0ea8875fa888f1f20b31e9ef67b73966078b14.tar.gz rails-6c0ea8875fa888f1f20b31e9ef67b73966078b14.tar.bz2 rails-6c0ea8875fa888f1f20b31e9ef67b73966078b14.zip | |
Merge pull request #8339 from latortuga/cache-digest-opt-out-cleanup
Cache digest opt out cleanup
Diffstat (limited to 'actionpack/lib')
| -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) |