diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:26:45 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:26:45 +0000 |
| commit | d15d15b2c236a556f89536961adf2de7f1fd04dc (patch) | |
| tree | 37f35f4cec5c7bdf34cbf6fbcd2a5ef44cf8a97c /actionpack/lib/action_controller/layout.rb | |
| parent | d7b5b44a0e6fddb772c1c0779489c17e1caa4a39 (diff) | |
| download | rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.gz rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.bz2 rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.zip | |
Deprecate @response
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 338d5980ab..f6d687bd10 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -250,7 +250,7 @@ module ActionController #:nodoc: erase_render_results add_variables_to_assigns @template.instance_variable_set("@content_for_layout", content_for_layout) - @response.layout = layout + response.layout = layout render_text(@template.render_file(layout, true), deprecated_status) else render_with_no_layout(options, deprecated_status, &block) |