diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-09-09 17:25:09 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-09-09 17:25:09 -0500 |
| commit | 6228220c9b8a3bb32f8617ad2d963dabc965376e (patch) | |
| tree | cecf4f2ef0fd7c2747826fd22c56ba8f596ed1c4 /actionpack/lib/action_controller | |
| parent | 36c6aa01ee0a7aee5b0510a8e649c44de318b060 (diff) | |
| download | rails-6228220c9b8a3bb32f8617ad2d963dabc965376e.tar.gz rails-6228220c9b8a3bb32f8617ad2d963dabc965376e.tar.bz2 rails-6228220c9b8a3bb32f8617ad2d963dabc965376e.zip | |
Revert "Revert "Add layout functionality to mailers.""
This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 455e242c22..3631ce86af 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -216,7 +216,7 @@ module ActionController #:nodoc: # object). If the layout was defined without a directory, layouts is assumed. So <tt>layout "weblog/standard"</tt> will return # weblog/standard, but <tt>layout "standard"</tt> will return layouts/standard. def active_layout(passed_layout = nil) - layout = passed_layout || self.class.default_layout(response.template.template_format) + layout = passed_layout || self.class.default_layout(default_template_format) active_layout = case layout when String then layout when Symbol then __send__(layout) @@ -276,5 +276,9 @@ module ActionController #:nodoc: rescue ActionView::MissingTemplate false end + + def default_template_format + response.template.template_format + end end end |