diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 18:54:55 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 18:54:55 -0700 |
commit | 85b1a55f6d296f79c81e81c2ec90370504c1b0e1 (patch) | |
tree | 8db3fa551ec61d40048763b8789dac139c9b4f6e /actionpack/lib/action_controller/base/render.rb | |
parent | f28bd9557c669cd63c31704202a46dd83f0a4102 (diff) | |
parent | 0a132c2fe13fb2b8d5dade9cf6abd70601376287 (diff) | |
download | rails-85b1a55f6d296f79c81e81c2ec90370504c1b0e1.tar.gz rails-85b1a55f6d296f79c81e81c2ec90370504c1b0e1.tar.bz2 rails-85b1a55f6d296f79c81e81c2ec90370504c1b0e1.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base/render.rb')
-rw-r--r-- | actionpack/lib/action_controller/base/render.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/base/render.rb index 606df58518..52934076e6 100644 --- a/actionpack/lib/action_controller/base/render.rb +++ b/actionpack/lib/action_controller/base/render.rb @@ -374,8 +374,13 @@ module ActionController render_for_file(name.sub(/^\//, ''), [layout, true], options) end end - + + # ==== Arguments + # parts<Array[String, Array[Symbol*], String, Boolean]>:: + # Example: ["show", [:html, :xml], "users", false] def render_for_parts(parts, layout, options = {}) + parts[1] = {:formats => parts[1], :locales => [I18n.locale]} + tmp = view_paths.find_by_parts(*parts) layout = _pick_layout(*layout) unless tmp.exempt_from_layout? |