Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…ments
  • Loading branch information...
commit 07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0 1 parent 80307c8
Pratik lifo authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  actionpack/lib/action_controller/base.rb
2  actionpack/lib/action_controller/base.rb
View
@@ -862,7 +862,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
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)

1 comment on commit 07298fd

Qichunren

very good.

Please sign in to comment.
Something went wrong with that request. Please try again.