diff options
| author | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
| commit | 10c581a6deed66e8b62de6e7a3621a63de90baad (patch) | |
| tree | 588ceb1118761602caa8ccf248dd08d59f33896c /actionpack/lib/action_controller/layout.rb | |
| parent | 64637da284ed4685591c178202ee103e6bee71cf (diff) | |
| parent | 81025b5808886289f54d698f73f4199c99223e7e (diff) | |
| download | rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.gz rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.bz2 rails-10c581a6deed66e8b62de6e7a3621a63de90baad.zip | |
fix merge
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index b5b59f2d7c..0721f71498 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -304,7 +304,7 @@ module ActionController #:nodoc: end def layout_directory?(layout_name) - @template.finder.find_template_extension_from_handler(File.join('layouts', layout_name)) + @template.view_paths.find_template_file_for_path("#{File.join('layouts', layout_name)}.#{@template.template_format}.erb") ? true : false end end end |