提交 b171db87 编写于 作者: S Santiago Pastorino

Merge pull request #4963 from ram123naresh/update_rails_2_use1_9

Replaced OrderedHash usage with Ruby 1.9 Hash
require 'active_support/core_ext/object/to_json'
require 'active_support/core_ext/module/delegation'
require 'active_support/json/variable'
require 'active_support/ordered_hash'
require 'bigdecimal'
require 'active_support/core_ext/big_decimal/conversions' # for #to_s
......@@ -239,8 +238,7 @@ def as_json(options = nil) #:nodoc:
# use encoder as a proxy to call as_json on all values in the subset, to protect from circular references
encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash : Hash
result[subset.map { |k, v| [k.to_s, encoder.as_json(v, options)] }]
Hash[subset.map { |k, v| [k.to_s, encoder.as_json(v, options)] }]
end
def encode_json(encoder)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册