github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove double layout check

Browse Source
This commit is contained in:
Pratik Naik
2008-08-30 19:35:29 +01:00
parent 83c6ba1889
commit afea4c9b0e
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actionpack/lib/action_controller/base.rb
View File

@@ -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