diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-30 19:35:29 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-30 19:35:29 +0100 |
| commit | afea4c9b0edb895d3d7ded6bbf45fc55739a96c6 (patch) | |
| tree | 7efdeb627292d666e3704f29fa3323702c9d462b /actionpack | |
| parent | 83c6ba18899a9f797d79726ca0078bdf618ec3d4 (diff) | |
| download | rails-afea4c9b0edb895d3d7ded6bbf45fc55739a96c6.tar.gz rails-afea4c9b0edb895d3d7ded6bbf45fc55739a96c6.tar.bz2 rails-afea4c9b0edb895d3d7ded6bbf45fc55739a96c6.zip | |
Remove double layout check
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 32c1dcbcaf..3b0f19475e 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -897,12 +897,7 @@ module ActionController #:nodoc: render_for_text(@template.render(options), options[:status]) elsif action_name = options[:action] - template = default_template_name(action_name.to_s) - if options[:layout] && !template_exempt_from_layout?(template) - render_with_a_layout(:file => template, :status => options[:status], :layout => true) - else - render_with_no_layout(:file => template, :status => options[:status]) - end + render_for_file(default_template_name(action_name.to_s), options[:status], nil, options[:locals] || {}) elsif xml = options[:xml] response.content_type ||= Mime::XML |