diff options
| author | Daniel Morrison <daniel@collectiveidea.com> | 2008-05-12 22:02:04 -0400 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-13 09:50:45 -0700 |
| commit | f498f221bdd88a04458f56ee917c360bca833e94 (patch) | |
| tree | d7ca8c8cbc2265079106e1590396c07ccb4bb199 | |
| parent | 74fd17346f30fddba0e174ae17f5697f2c22279e (diff) | |
| download | rails-f498f221bdd88a04458f56ee917c360bca833e94.tar.gz rails-f498f221bdd88a04458f56ee917c360bca833e94.tar.bz2 rails-f498f221bdd88a04458f56ee917c360bca833e94.zip | |
Include time zone offset in TimeWithZone#to_json
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 21ddcaad48..48606dbcff 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -78,7 +78,7 @@ module ActiveSupport def to_json(options = nil) if ActiveSupport.use_standard_json_time_format - utc.xmlschema.inspect + xmlschema.inspect else %("#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}") end diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 64fcb4af09..70c393dd46 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -70,7 +70,7 @@ class TimeWithZoneTest < Test::Unit::TestCase def test_to_json_with_use_standard_json_time_format_config_set_to_true old, ActiveSupport.use_standard_json_time_format = ActiveSupport.use_standard_json_time_format, true - assert_equal "\"2000-01-01T00:00:00Z\"", @twz.to_json + assert_equal "\"1999-12-31T19:00:00-05:00\"", @twz.to_json ensure ActiveSupport.use_standard_json_time_format = old end |