diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 17:41:28 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 18:54:13 -0700 |
| commit | f28bd9557c669cd63c31704202a46dd83f0a4102 (patch) | |
| tree | 4ec4423cfbcc9414982e0e72adda354c69cce541 /activesupport/lib/active_support/time_with_zone.rb | |
| parent | 5c4ba6e3fc66a779c28a70b8d7bde14b49e7c36c (diff) | |
| download | rails-f28bd9557c669cd63c31704202a46dd83f0a4102.tar.gz rails-f28bd9557c669cd63c31704202a46dd83f0a4102.tar.bz2 rails-f28bd9557c669cd63c31704202a46dd83f0a4102.zip | |
Fix dependencies revealed by testing in isolation
Diffstat (limited to 'activesupport/lib/active_support/time_with_zone.rb')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index aa448debda..0d4c75d272 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -131,7 +131,7 @@ module ActiveSupport # Time.utc(2005,2,1,15,15,10).in_time_zone.to_json # # => "2005/02/01 15:15:10 +0000" def to_json(options = nil) - if ActiveSupport.use_standard_json_time_format + if !ActiveSupport.respond_to?(:use_standard_json_time_format) || ActiveSupport.use_standard_json_time_format xmlschema.inspect else %("#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}") |