From 191a2f78b1abeb4d3b5b27de83ffe14b833c4c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 18 Mar 2010 12:10:40 +0100 Subject: [PATCH] Sending the partial as info is no longer required. --- actionpack/lib/action_view/template/resolver.rb | 6 +++--- 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 @@ def to_s 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 @@ def build_path(name, prefix, partial, details) path end - def query(partial, path, exts) + def query(path, exts) query = File.join(@path, path) exts.each do |ext| @@ -77,7 +77,7 @@ def query(partial, path, exts) 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 @@ def initialize(hash = {}) 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 @@ def query(partial, path, exts) @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 } -- GitLab