diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-16 13:44:51 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-16 13:44:51 -0700 |
commit | dd58f4021da30af7f40ee139e7487b887cac44e9 (patch) | |
tree | 34cb015228013c437851a3a13d7059357e57db13 /actionpack/lib/action_controller/abstract | |
parent | 01a4bc84b8787df74d54147a0cf564df75e87970 (diff) | |
download | rails-dd58f4021da30af7f40ee139e7487b887cac44e9.tar.gz rails-dd58f4021da30af7f40ee139e7487b887cac44e9.tar.bz2 rails-dd58f4021da30af7f40ee139e7487b887cac44e9.zip |
An exception is raised if a layout is missing only if the layout is missing for all mimes
Diffstat (limited to 'actionpack/lib/action_controller/abstract')
-rw-r--r-- | actionpack/lib/action_controller/abstract/layouts.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb index 2ac4e6068a..6aa196e807 100644 --- a/actionpack/lib/action_controller/abstract/layouts.rb +++ b/actionpack/lib/action_controller/abstract/layouts.rb @@ -140,6 +140,8 @@ module AbstractController rescue NameError => e raise NoMethodError, "You specified #{@_layout.inspect} as the layout, but no such method was found" + rescue ActionView::MissingTemplate + _find_by_parts(_layout({}), {}) end end |