Merge pull request #65 from teeparham/array-root

use :root option in render :json
This commit is contained in:
Yehuda Katz
2012-06-05 00:31:13 -07:00
2 changed files with 11 additions and 1 deletions

View File

@@ -41,7 +41,7 @@ module ActionController
def _render_option_json(json, options)
if json.respond_to?(:to_ary)
options[:root] ||= controller_name
options[:root] ||= controller_name unless options[:root] == false
end
serializer = options.delete(:serializer) ||