diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-07-05 02:38:55 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-07-05 02:38:55 +0000 |
| commit | 11c715a53fd6309c37883b7d44462cc0a66f3bba (patch) | |
| tree | e806db190d63f9628a8c0fc91da5f6da61e7329f /actionpack/lib/action_controller/layout.rb | |
| parent | 73c80169c85d6405940dc6c45dcc0ccff9d689df (diff) | |
| download | rails-11c715a53fd6309c37883b7d44462cc0a66f3bba.tar.gz rails-11c715a53fd6309c37883b7d44462cc0a66f3bba.tar.bz2 rails-11c715a53fd6309c37883b7d44462cc0a66f3bba.zip | |
Added exception handling of missing layouts (closes #5373) [chris@ozmm.org]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index e421f8ed9e..91ca16913e 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -236,6 +236,8 @@ module ActionController #:nodoc: template_with_options = options.is_a?(Hash) if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options, deprecated_layout)) + assert_existence_of_template_file(layout) + options = options.merge :layout => false if template_with_options logger.info("Rendering #{options} within #{layout}") if logger |