diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-09-09 17:20:55 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-09-09 17:20:55 -0500 |
| commit | 36c6aa01ee0a7aee5b0510a8e649c44de318b060 (patch) | |
| tree | 6988605e522b146dad945f308b20ea412e3842bb /actionpack | |
| parent | 1398db0128be7ae01700712eafc95be5de430f7c (diff) | |
| download | rails-36c6aa01ee0a7aee5b0510a8e649c44de318b060.tar.gz rails-36c6aa01ee0a7aee5b0510a8e649c44de318b060.tar.bz2 rails-36c6aa01ee0a7aee5b0510a8e649c44de318b060.zip | |
Revert "Add layout functionality to mailers."
This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 3631ce86af..455e242c22 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(default_template_format) + layout = passed_layout || self.class.default_layout(response.template.template_format) active_layout = case layout when String then layout when Symbol then __send__(layout) @@ -276,9 +276,5 @@ module ActionController #:nodoc: rescue ActionView::MissingTemplate false end - - def default_template_format - response.template.template_format - end end end |