diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-07 04:39:50 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-07 04:39:50 -0700 |
| commit | f77cd7c7b6a4cf3dea15908c3f3e85c34b484aa9 (patch) | |
| tree | 690709ab56e7bf41748836f3fd20c6bf6529f534 /activesupport/lib | |
| parent | c444b0f67bf5f998f1f0e0271116fb111d1ba93a (diff) | |
| parent | 96546bb63bd5f1b24f5126e7a3314580bc59584f (diff) | |
| download | rails-f77cd7c7b6a4cf3dea15908c3f3e85c34b484aa9.tar.gz rails-f77cd7c7b6a4cf3dea15908c3f3e85c34b484aa9.tar.bz2 rails-f77cd7c7b6a4cf3dea15908c3f3e85c34b484aa9.zip | |
Merge pull request #286 from jasoncodes/marshal_subsec
Fix marshal round-tripping of fractional seconds (Time#subsec).
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/marshal.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/marshal.rb b/activesupport/lib/active_support/core_ext/time/marshal.rb index 1a4d918ce7..457d3f5b62 100644 --- a/activesupport/lib/active_support/core_ext/time/marshal.rb +++ b/activesupport/lib/active_support/core_ext/time/marshal.rb @@ -37,6 +37,7 @@ if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone time.instance_eval do if zone = defined?(@_zone) && remove_instance_variable('@_zone') ary = to_a + ary[0] += subsec if ary[0] == sec ary[-1] = zone utc? ? Time.utc(*ary) : Time.local(*ary) else |