lib/active_support/json/encoders/date.rb in activesupport-2.0.5 vs lib/active_support/json/encoders/date.rb in activesupport-2.1.0

@@ -1,5 +1,14 @@
 class Date
-  def to_json(options = nil) #:nodoc:
-    %("#{strftime("%Y/%m/%d")}")
+  # Returns a JSON string representing the date.
+  #
+  # ==== Example:
+  #   Date.new(2005,2,1).to_json
+  #   # => "2005/02/01"
+  def to_json(options = nil)
+    if ActiveSupport.use_standard_json_time_format
+      %("#{strftime("%Y-%m-%d")}")
+    else
+      %("#{strftime("%Y/%m/%d")}")
+    end
   end
 end