aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/layouts.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/abstract/layouts.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/layouts.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index c8d6e77fce..c6b99a6d45 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -1,10 +1,7 @@
module AbstractController
module Layouts
- def _render_template(tmp)
- _action_view._render_template_with_layout(tmp, _layout)
- end
-
- def _layout
+ def _render_template(template, options)
+ _action_view._render_template_with_layout(template, options[:_layout])
end
end
end \ No newline at end of file