diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
| commit | ae812c0a7bdb876c03752adfaa980ac4e74f2e17 (patch) | |
| tree | 73eba5b0ddce60a4578fcbf6be581b8f35488273 /actionpack/lib/action_controller/base/layout.rb | |
| parent | 67f30fd9639409877a57a7ba758cd13496433d69 (diff) | |
| parent | 3c4c6bd0df598f865f49a983b4c65c415af4bcfc (diff) | |
| download | rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.gz rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.bz2 rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/base/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/layout.rb b/actionpack/lib/action_controller/base/layout.rb index 4fcef6c5d9..1ad5191c73 100644 --- a/actionpack/lib/action_controller/base/layout.rb +++ b/actionpack/lib/action_controller/base/layout.rb @@ -182,7 +182,7 @@ module ActionController #:nodoc: def memoized_find_layout(layout, formats) #:nodoc: return layout if layout.nil? || layout.respond_to?(:render) prefix = layout.to_s =~ /layouts\// ? nil : "layouts" - view_paths.find_by_parts(layout.to_s, formats, prefix) + view_paths.find_by_parts(layout.to_s, {:formats => formats}, prefix) end def find_layout(*args) |