diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-04-22 17:16:28 -0700 |
|---|---|---|
| committer | Yehuda Katz and Carl Lerche <wycats@gmail.com> | 2009-04-22 17:24:41 -0700 |
| commit | 0a132c2fe13fb2b8d5dade9cf6abd70601376287 (patch) | |
| tree | cf9194a0a9df3cf36e7a1ffbe8b8e16274c94ee9 /actionpack/lib/action_controller/abstract | |
| parent | b2d6fdae353be4fca41d7ac1839f30d9737162fd (diff) | |
| download | rails-0a132c2fe13fb2b8d5dade9cf6abd70601376287.tar.gz rails-0a132c2fe13fb2b8d5dade9cf6abd70601376287.tar.bz2 rails-0a132c2fe13fb2b8d5dade9cf6abd70601376287.zip | |
Refactor ActionView::Path
* Decouple from ActionController and ActionMailer
* Bring back localization support.
* Prepare to decouple templates from the filesystem.
* Prepare to decouple localization from ActionView
* Fix ActionMailer to take advantage of ActionView::Path
Diffstat (limited to 'actionpack/lib/action_controller/abstract')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/layouts.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/abstract/renderer.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb index 478b301a26..0039e67c5a 100644 --- a/actionpack/lib/action_controller/abstract/layouts.rb +++ b/actionpack/lib/action_controller/abstract/layouts.rb @@ -38,7 +38,7 @@ module AbstractController else self.class_eval %{ def _layout - if view_paths.find_by_parts?("#{_implied_layout_name}", formats, "layouts") + if view_paths.find_by_parts?("#{_implied_layout_name}", {:formats => formats}, "layouts") "#{_implied_layout_name}" else super @@ -62,7 +62,7 @@ module AbstractController raise ArgumentError, "String, false, or nil expected; you passed #{name.inspect}" end - name && view_paths.find_by_parts(name, formats, "layouts") + name && view_paths.find_by_parts(name, {:formats => formats}, "layouts") end def _default_layout(require_layout = false) diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb index a86eef889e..e31accbbfc 100644 --- a/actionpack/lib/action_controller/abstract/renderer.rb +++ b/actionpack/lib/action_controller/abstract/renderer.rb @@ -29,7 +29,7 @@ module AbstractController def render_to_body(options = {}) name = options[:_template_name] || action_name - template = options[:_template] || view_paths.find_by_parts(name.to_s, formats, options[:_prefix]) + template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix]) _render_template(template, options) end |