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

@@ -1,5 +1,14 @@
 class Time
-  def to_json(options = nil) #:nodoc:
-    to_datetime.to_json(options)
+  # Returns a JSON string representing the time.
+  #
+  # ==== Example:
+  #   Time.utc(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")} #{formatted_offset(false)}")
+    end
   end
 end