diff options
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index ff4a4057a2..5655a9bd0b 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -247,7 +247,8 @@ module ActionController #:nodoc: add_variables_to_assigns @template.instance_variable_set("@content_for_layout", content_for_layout) response.layout = layout - render_for_text(@template.render_file(layout, true)) + status = template_with_options ? options[:status] : nil + render_for_text(@template.render_file(layout, true), status) else render_with_no_layout(options, &block) end |