aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-18 12:10:40 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-18 12:12:07 +0100
commit191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f (patch)
tree127884b032fd53f412f8aed4e618c02e54ebd2af /actionpack/lib
parent41af6d9a78446a5219a321cf638945b1608cefd8 (diff)
downloadrails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.tar.gz
rails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.tar.bz2
rails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.zip
Sending the partial as info is no longer required.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/template/resolver.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index ee13707327..28cd30a959 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -57,7 +57,7 @@ module ActionView
def find_templates(name, prefix, partial, details)
path = build_path(name, prefix, partial, details)
- query(partial, path, EXTENSION_ORDER.map { |ext| details[ext] })
+ query(path, EXTENSION_ORDER.map { |ext| details[ext] })
end
def build_path(name, prefix, partial, details)
@@ -67,7 +67,7 @@ module ActionView
path
end
- def query(partial, path, exts)
+ def query(path, exts)
query = File.join(@path, path)
exts.each do |ext|
@@ -77,7 +77,7 @@ module ActionView
Dir[query].reject { |p| File.directory?(p) }.map do |p|
handler, format = extract_handler_and_format(p)
Template.new(File.read(p), File.expand_path(p), handler,
- :partial => partial, :virtual_path => path, :format => format)
+ :virtual_path => path, :format => format)
end
end