diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-26 20:04:47 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-26 20:04:47 -0700 |
| commit | ee46ffedb88f812467485167036c7d254d0ce757 (patch) | |
| tree | 3a2024e2edff6a61822a12c6308a1d917fa683fe /activesupport/lib/active_support/json/encoders/date_time.rb | |
| parent | 678385d307559b2b5737bb2b07f633d2b9a0802c (diff) | |
| download | rails-ee46ffedb88f812467485167036c7d254d0ce757.tar.gz rails-ee46ffedb88f812467485167036c7d254d0ce757.tar.bz2 rails-ee46ffedb88f812467485167036c7d254d0ce757.zip | |
Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/date_time.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/date_time.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoders/date_time.rb b/activesupport/lib/active_support/json/encoders/date_time.rb index 343612afe9..3a29292b24 100644 --- a/activesupport/lib/active_support/json/encoders/date_time.rb +++ b/activesupport/lib/active_support/json/encoders/date_time.rb @@ -12,7 +12,7 @@ class DateTime # # 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 rails_to_json(options = nil) + def rails_to_json(*) if ActiveSupport.use_standard_json_time_format xmlschema.inspect else |