diff options
| author | gbuesing <gbuesing@gmail.com> | 2008-05-18 10:48:11 -0500 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-05-18 10:48:11 -0500 |
| commit | be85868987675a158fd4111393b9161296431728 (patch) | |
| tree | 96550f51df56389008dde65bbfee092c2c5a279a /activesupport/lib | |
| parent | 0f333449bd47737a7260d7b9770a2bc50a373abb (diff) | |
| download | rails-be85868987675a158fd4111393b9161296431728.tar.gz rails-be85868987675a158fd4111393b9161296431728.tar.bz2 rails-be85868987675a158fd4111393b9161296431728.zip | |
Time#to_json: don't convert to utc before encoding. References #175
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/time.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoders/time.rb b/activesupport/lib/active_support/json/encoders/time.rb index 3660d87c82..57ed3c9e31 100644 --- a/activesupport/lib/active_support/json/encoders/time.rb +++ b/activesupport/lib/active_support/json/encoders/time.rb @@ -6,7 +6,7 @@ class Time # # => 2005/02/01 15:15:10 +0000" def to_json(options = nil) if ActiveSupport.use_standard_json_time_format - utc.xmlschema.inspect + xmlschema.inspect else %("#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}") end |