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

Don't recurse when ActionController#render is called without any arguments

Browse Source
This commit is contained in:
Pratik Naik
2008-12-26 01:49:14 +00:00
parent 80307c8b0a
commit 07298fd092
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -862,7 +862,7 @@ module ActionController #:nodoc:
validate_render_arguments(options, extra_options, block_given?)
if options.nil?
return render(:file => default_template, :layout => true)
options = { :template => default_template.filename, :layout => true }
elsif options == :update
options = extra_options.merge({ :update => true })
elsif options.is_a?(String) || options.is_a?(Symbol)