diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-23 09:00:05 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-23 09:00:05 +0000 |
commit | b366dbd952417a610913e05ad58024b7da03fdb8 (patch) | |
tree | 0ca8e594c78a92cec73ca0abec49fec90d8373e3 /actionpack/lib/action_controller/layout.rb | |
parent | d1725929852ab9da48f7ff7c4fa7f401ac55c331 (diff) | |
download | rails-b366dbd952417a610913e05ad58024b7da03fdb8.tar.gz rails-b366dbd952417a610913e05ad58024b7da03fdb8.tar.bz2 rails-b366dbd952417a610913e05ad58024b7da03fdb8.zip |
Improved performance with 5-30% through a series of Action Pack optimizations #1811 [Stefan Kaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1905 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 d7e01564a0..a6a8d4096f 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -210,7 +210,7 @@ module ActionController #:nodoc: @content_for_layout = render_with_no_layout(options.merge(:layout => false)) erase_render_results - add_variables_to_assigns + @assigns["content_for_layout"] = @content_for_layout render_with_no_layout(options.merge({ :text => @template.render_file(layout, true), :status => options[:status] || deprecated_status })) else render_with_no_layout(options, deprecated_status) |