diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-18 12:10:40 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-18 12:12:07 +0100 |
commit | 191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f (patch) | |
tree | 127884b032fd53f412f8aed4e618c02e54ebd2af | |
parent | 41af6d9a78446a5219a321cf638945b1608cefd8 (diff) | |
download | rails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.tar.gz rails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.tar.bz2 rails-191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f.zip |
Sending the partial as info is no longer required.
-rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 6 | ||||
-rw-r--r-- | actionpack/test/lib/fixture_template.rb | 4 |
2 files changed, 5 insertions, 5 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 diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb index 2e876d9249..74c0918a14 100644 --- a/actionpack/test/lib/fixture_template.rb +++ b/actionpack/test/lib/fixture_template.rb @@ -9,7 +9,7 @@ module ActionView #:nodoc: private - def query(partial, path, exts) + def query(path, exts) query = Regexp.escape(path) exts.each do |ext| query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)' @@ -19,7 +19,7 @@ module ActionView #:nodoc: @hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source| handler, format = extract_handler_and_format(path) templates << Template.new(source, path, handler, - :partial => partial, :virtual_path => path, :format => format) + :virtual_path => path, :format => format) end templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size } |