diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-04-29 19:47:21 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-04-29 19:47:21 -0300 |
commit | b0bd4f45fa9180793e3c35590c8a887ddfe43553 (patch) | |
tree | d1ab690267c5e4d9d04faca14d4695f163375086 /actionpack/lib/action_controller/base/render.rb | |
parent | 19d2ff83db5232a816dee201800baf3924705b31 (diff) | |
parent | db892ea77563dadb6fbbd242be78ff87321d0bd1 (diff) | |
download | rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.tar.gz rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.tar.bz2 rails-b0bd4f45fa9180793e3c35590c8a887ddfe43553.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/base/render.rb')
-rw-r--r-- | actionpack/lib/action_controller/base/render.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/base/render.rb index 33695cd78e..4286577ec5 100644 --- a/actionpack/lib/action_controller/base/render.rb +++ b/actionpack/lib/action_controller/base/render.rb @@ -254,7 +254,7 @@ module ActionController render_for_text(js) elsif json = options[:json] - json = ActiveSupport::JSON.encode(json) unless json.is_a?(String) + json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str) json = "#{options[:callback]}(#{json})" unless options[:callback].blank? response.content_type ||= Mime::JSON render_for_text(json) @@ -378,13 +378,14 @@ module ActionController # ==== Arguments # parts<Array[String, Array[Symbol*], String, Boolean]>:: # Example: ["show", [:html, :xml], "users", false] - def render_for_parts(parts, layout, options = {}) + def render_for_parts(parts, layout_details, 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? - + layout = _pick_layout(*layout_details) unless + self.class.exempt_from_layout.include?(tmp.handler) + render_for_text( @template._render_template_with_layout(tmp, layout, options, parts[3])) end |