From 5c0656c9ee9ecc7ffeebea69dc0cd371d978b254 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 28 Mar 2008 20:54:26 +0000 Subject: Fix layouts in symlinked paths. Closes #9136 [court3nay, caio] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/template_finder.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/template_finder.rb b/actionpack/lib/action_view/template_finder.rb index 0fb5eaa65e..aaf34de538 100644 --- a/actionpack/lib/action_view/template_finder.rb +++ b/actionpack/lib/action_view/template_finder.rb @@ -23,9 +23,8 @@ module ActionView #:nodoc: def process_view_paths(*view_paths) view_paths.flatten.compact.each do |dir| next if @@processed_view_paths.has_key?(dir) - @@processed_view_paths[dir] = [] - Dir.glob("#{dir}/**/*").each do |file| + Dir.glob("#{dir}/**/*/**").each do |file| unless File.directory?(file) @@processed_view_paths[dir] << file.split(dir).last.sub(/^\//, '') -- cgit v1.2.3