Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"

This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing
changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd.

Reason: This broke the build
https://travis-ci.org/rails/rails/jobs/6629894

3 files changed, 2 insertions, 11 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 84bb98e1b0..e30029fb6d 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,14 +1,5 @@
 ## Rails 4.0.0 (unreleased) ##
 
-*   Fix cache digests to respect the format of view files being looked up.
-    `Digestor` called `LookupContext#find` with the options as the wrong argument
-    causing the formats option to be ignored.
-
-    Caching `article/show.pdf.erb` now correctly digests any dependencies as
-    `_partial.pdf.erb` and not `_partial.html.erb`.
-
-    *Martin Westin*
-
 *   Add support for passing custom url options other than `:host` and custom
     status and flash options to `force_ssl`.
 
diff --git a/actionpack/lib/action_view/digestor.rb b/actionpack/lib/action_view/digestor.rb
index 6b9415e55d..9324a1ac50 100644
--- a/actionpack/lib/action_view/digestor.rb
+++ b/actionpack/lib/action_view/digestor.rb
@@ -57,7 +57,7 @@ module ActionView
       end
 
       def template
-        @template ||= finder.find(logical_name, [], partial?, [], formats: [ format ])
+        @template ||= finder.find(logical_name, [], partial?, formats: [ format ])
       end
 
       def source
diff --git a/actionpack/test/template/digestor_test.rb b/actionpack/test/template/digestor_test.rb
index 4c4264c0ba..e29cecabc0 100644
--- a/actionpack/test/template/digestor_test.rb
+++ b/actionpack/test/template/digestor_test.rb
@@ -15,7 +15,7 @@ end
 class FixtureFinder
   FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
 
-  def find(logical_name, prefixes, partial, keys, options)
+  def find(logical_name, keys, partial, options)
     FixtureTemplate.new("digestor/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
   end
 end