diff options
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/date.rb')
-rw-r--r-- | activesupport/lib/active_support/json/encoders/date.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoders/date.rb b/activesupport/lib/active_support/json/encoders/date.rb index d55f17962b..cb9419d29d 100644 --- a/activesupport/lib/active_support/json/encoders/date.rb +++ b/activesupport/lib/active_support/json/encoders/date.rb @@ -5,6 +5,10 @@ class Date # Date.new(2005,2,1).to_json # # => "2005/02/01" def to_json(options = nil) - %("#{strftime("%Y/%m/%d")}") + if ActiveSupport.use_standard_json_time_format + %("#{strftime("%Y-%m-%d")}") + else + %("#{strftime("%Y/%m/%d")}") + end end end |