aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-26 01:49:14 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-26 01:49:14 +0000
commit07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0 (patch)
tree6279544ecdfc283bed0a4b7ea308a82ec2156922 /actionpack/lib
parent80307c8b0a889acc7abb7f4e52fd4c02e1063ba8 (diff)
downloadrails-07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0.tar.gz
rails-07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0.tar.bz2
rails-07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0.zip
Don't recurse when ActionController#render is called without any arguments
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index cb654534af..5b83494eb4 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -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)