diff options
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) |