diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-04-19 18:52:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-04-19 18:59:13 +0100 |
| commit | ef4c65088fb907fc819e6b5d83d284c38cdaabfc (patch) | |
| tree | e4e674e270a04a71deb0aa5741ae6c4f16b847db /actionpack/lib/action_controller/layout.rb | |
| parent | 534c6b2444970d59aea654aa3c6aeb41c206d14d (diff) | |
| download | rails-ef4c65088fb907fc819e6b5d83d284c38cdaabfc.tar.gz rails-ef4c65088fb907fc819e6b5d83d284c38cdaabfc.tar.bz2 rails-ef4c65088fb907fc819e6b5d83d284c38cdaabfc.zip | |
Move missing template logic to ActionView
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 5484add3b5..b5b59f2d7c 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -244,9 +244,7 @@ module ActionController #:nodoc: def render_with_a_layout(options = nil, extra_options = {}, &block) #:nodoc: template_with_options = options.is_a?(Hash) - if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options)) - assert_existence_of_template_file(layout) - + if (layout = pick_layout(template_with_options, options)) && apply_layout?(template_with_options, options) options = options.merge :layout => false if template_with_options logger.info("Rendering template within #{layout}") if logger |