Ensure resolvers backward compatibility.

This commit is contained in:
José Valim 2010-12-09 14:06:44 +01:00
parent 8e6d27641c
commit d3f7e565d1
3 changed files with 4 additions and 6 deletions

View File

@ -109,7 +109,7 @@ module ActionView
def args_for_lookup(name, prefix, partial, keys) #:nodoc:
name, prefix = normalize_name(name, prefix)
[name, prefix, partial || false, @details, keys, details_key]
[name, prefix, partial || false, @details, details_key, keys]
end
# Support legacy foo.erb names even though we now ignore .erb

View File

@ -10,10 +10,8 @@ module ActionView #:nodoc:
METHOD
end
def find(path, prefix = nil, partial = false, details = {}, keys = [], key = nil)
template = find_all(path, prefix, partial, details, keys, key).first
raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
template
def find(*args)
find_all(*args).first || raise(MissingTemplate.new(self, "#{args[1]}/#{args[0]}", args[3], args[2]))
end
def find_all(*args)

View File

@ -15,7 +15,7 @@ module ActionView
end
# Normalizes the arguments and passes it on to find_template.
def find_all(name, prefix=nil, partial=false, details={}, locals=[], key=nil)
def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
cached(key, [name, prefix, partial], details, locals) do
find_templates(name, prefix, partial, details)
end