Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Merge pull request #10337 from eimermusic/fix_template_digest…

…or_lookup"

This reverts commit b423962, reversing
changes made to f99ce3c.

Reason: This broke the build
https://travis-ci.org/rails/rails/jobs/6629894
  • Loading branch information...
commit faa2c71deef44ded8ef73513e63229d057552540 1 parent b423962
@rafaelfranca rafaelfranca authored
View
9 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`.
View
2  actionpack/lib/action_view/digestor.rb
@@ -57,7 +57,7 @@ def partial?
end
def template
- @template ||= finder.find(logical_name, [], partial?, [], formats: [ format ])
+ @template ||= finder.find(logical_name, [], partial?, formats: [ format ])
end
def source
View
2  actionpack/test/template/digestor_test.rb
@@ -15,7 +15,7 @@ def initialize(template_path)
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
Please sign in to comment.
Something went wrong with that request. Please try again.