diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-28 20:54:26 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-28 20:54:26 +0000 |
| commit | 5c0656c9ee9ecc7ffeebea69dc0cd371d978b254 (patch) | |
| tree | fff923a09f4eb9c1f94a18d02458275249f8d705 /actionpack/lib | |
| parent | 6efee90bf234328e3672bc79408c2da5b9673539 (diff) | |
| download | rails-5c0656c9ee9ecc7ffeebea69dc0cd371d978b254.tar.gz rails-5c0656c9ee9ecc7ffeebea69dc0cd371d978b254.tar.bz2 rails-5c0656c9ee9ecc7ffeebea69dc0cd371d978b254.zip | |
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
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/template_finder.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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(/^\//, '') |