vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb in radiant-0.6.9 vs vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb in radiant-0.7.0

- old
+ new

@@ -1,5 +1,14 @@ class DateTime - def to_json(options = nil) #:nodoc: - %("#{strftime("%Y/%m/%d %H:%M:%S %z")}") + # Returns a JSON string representing the datetime. + # + # ==== Example: + # DateTime.civil(2005,2,1,15,15,10).to_json + # # => "2005/02/01 15:15:10 +0000" + def to_json(options = nil) + if ActiveSupport.use_standard_json_time_format + xmlschema.inspect + else + strftime('"%Y/%m/%d %H:%M:%S %z"') + end end end