aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-08-31 03:44:00 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-08-31 03:48:09 +0100
commita59a3db1f3ae8c6aadaa8e1ce08b05f9ad677932 (patch)
treef54b4998a217ff4a0fc6d94fca9e3fd9d88dc694 /actionpack/lib/action_controller/layout.rb
parent6183e55f714b436335dc843528be7525c342d922 (diff)
downloadrails-a59a3db1f3ae8c6aadaa8e1ce08b05f9ad677932.tar.gz
rails-a59a3db1f3ae8c6aadaa8e1ce08b05f9ad677932.tar.bz2
rails-a59a3db1f3ae8c6aadaa8e1ce08b05f9ad677932.zip
Move copying ivar logic from ActionController::Base to ActionView::Base
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
-rw-r--r--actionpack/lib/action_controller/layout.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index fd743ced38..585bd03797 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -250,7 +250,6 @@ module ActionController #:nodoc:
content_for_layout = render_with_no_layout(options, extra_options, &block)
erase_render_results
- add_variables_to_assigns
@template.instance_variable_set("@content_for_layout", content_for_layout)
response.layout = layout
status = template_with_options ? options[:status] : nil