From 84cab320bc1faaddc142cbbb38713d3f29a8b07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 26 Aug 2010 15:19:55 -0300 Subject: Ensure templates like template.html are found but still uses the proper virtual path. --- actionpack/lib/action_view/template.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 40ff1f2182..7decec24ab 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -113,12 +113,13 @@ module ActionView @identifier = identifier @handler = handler @original_encoding = nil - - @virtual_path = details[:virtual_path] - @method_names = {} + @method_names = {} format = details[:format] || :html @formats = Array.wrap(format).map(&:to_sym) + + @virtual_path = details[:virtual_path] + @virtual_path.sub!(".#{format}", "") if @virtual_path end def render(view, locals, &block) -- cgit v1.2.3