diff options
| author | Yehuda Katz and Carl Lerche <wycats@gmail.com> | 2009-03-23 15:45:01 -0700 |
|---|---|---|
| committer | Yehuda Katz and Carl Lerche <wycats@gmail.com> | 2009-03-23 15:45:01 -0700 |
| commit | a501638e9dcf55e45613637c52e4169b6324f285 (patch) | |
| tree | afc99eff992a16b6b328563eb9db8cf707686cf2 /actionpack/lib/action_controller/new_base | |
| parent | 34f058e082754bb726a4753fa26e8e8c082702c0 (diff) | |
| download | rails-a501638e9dcf55e45613637c52e4169b6324f285.tar.gz rails-a501638e9dcf55e45613637c52e4169b6324f285.tar.bz2 rails-a501638e9dcf55e45613637c52e4169b6324f285.zip | |
Checkpoint
Diffstat (limited to 'actionpack/lib/action_controller/new_base')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/layouts.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb index 3b47a76077..c0efb669b2 100644 --- a/actionpack/lib/action_controller/new_base/layouts.rb +++ b/actionpack/lib/action_controller/new_base/layouts.rb @@ -7,31 +7,5 @@ module ActionController super end - - private - - def _layout_for_option(name) - case name - when String then _layout_for_name(name) - when true then _default_layout(true) - when false then nil - end - end - - def _layout_for_name(name) - view_paths.find_by_parts(name, formats, "layouts") - end - - def _default_layout(require_layout = false) - begin - _layout_for_name(controller_path) - rescue ActionView::MissingTemplate - begin - _layout_for_name("application") - rescue ActionView::MissingTemplate => e - raise e if require_layout - end - end - end end end
\ No newline at end of file |