Merge pull request #8339 from latortuga/cache-digest-opt-out-cleanup

Cache digest opt out cleanup

2 files changed, 10 insertions, 2 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 1e47c7d66a..aa4872f3ac 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add option flag to `CacheHelper#cache` to manually bypass automatic template digests:
+
+        <% cache project, skip_digest: true do %>
+          ...
+        <% end %>
+
+    *Drew Ulmer*
+
 *   No sort Hash options in #grouped_options_for_select. *Sergey Kojin*
 
 *   Accept symbols as #send_data :disposition value *Elia Schito*
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)