diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-16 13:00:36 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-16 13:01:23 +0100 |
| commit | 0432d151647f2178ddee79979827d552447c251f (patch) | |
| tree | 7c772cd260eb051cd7b80cf91468555f03db9e11 /activesupport/lib/active_support/json/encoders/date_time.rb | |
| parent | f7d08acd5e0650658383e3d3f86d6ff5b49e9030 (diff) | |
| download | rails-0432d151647f2178ddee79979827d552447c251f.tar.gz rails-0432d151647f2178ddee79979827d552447c251f.tar.bz2 rails-0432d151647f2178ddee79979827d552447c251f.zip | |
Merge with docrails.
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/date_time.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/date_time.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoders/date_time.rb b/activesupport/lib/active_support/json/encoders/date_time.rb index a4a5efbfb1..e259930033 100644 --- a/activesupport/lib/active_support/json/encoders/date_time.rb +++ b/activesupport/lib/active_support/json/encoders/date_time.rb @@ -1,7 +1,14 @@ class DateTime - # Returns a JSON string representing the datetime. + # Returns a JSON string representing the datetime. If ActiveSupport.use_standard_json_time_format is set to true, the + # ISO 8601 format is used. # - # ==== Example: + # ==== Examples: + # + # # With ActiveSupport.use_standard_json_time_format = true + # DateTime.civil(2005,2,1,15,15,10).to_json + # # => "2005-02-01T15:15:10+00:00" + # + # # With ActiveSupport.use_standard_json_time_format = false # DateTime.civil(2005,2,1,15,15,10).to_json # # => "2005/02/01 15:15:10 +0000" def to_json(options = nil) |