From 155eb47cf3a815306c5c9b6fcd254b838fc26b5c Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Thu, 22 Nov 2007 05:01:07 +0000
Subject: Tests and fix for extension extraction.  References #10130 [tarmo]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_view/base.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 81a8299e91..d73fb643e8 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -516,8 +516,7 @@ module ActionView #:nodoc:
       
       # Determine the template extension from the <tt>@first_render</tt> filename
       def find_template_extension_from_first_render
-        extension = @first_render.to_s.sub /^\w+\.?/, ''
-        extension.blank? ? nil : extension
+        File.basename(@first_render.to_s)[/^[^.]+\.(.+)$/, 1]
       end
 
       # This method reads a template file.
-- 
cgit v1.2.3