diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-04 05:24:08 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-04 05:24:08 +0000 |
| commit | 653bfe9600aa246e71780c63a87c4e678a532abb (patch) | |
| tree | da6b0b00c79f2149d273283426f628173baefb2f /actionpack/lib/action_controller/base.rb | |
| parent | ea831469a9b4070a05b14916fb56c54eb7f5dd4a (diff) | |
| download | rails-653bfe9600aa246e71780c63a87c4e678a532abb.tar.gz rails-653bfe9600aa246e71780c63a87c4e678a532abb.tar.bz2 rails-653bfe9600aa246e71780c63a87c4e678a532abb.zip | |
Dont raise deprecation warning on render :action => "stuff"
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4975 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7751d74069..433fd9f801 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -757,9 +757,9 @@ module ActionController #:nodoc: def render_action(action_name, status = nil, with_layout = true) #:nodoc: template = default_template_name(action_name.to_s) if with_layout && !template_exempt_from_layout?(template) - render_with_layout(template, status) + render_with_layout(:file => template, :status => status, :use_full_path => true, :layout => true) else - render_without_layout(template, status) + render_without_layout(:file => template, :status => status, :use_full_path => true) end end |